Skip to content

Commit

Permalink
refactor!: remove has("debug") (#22060)
Browse files Browse the repository at this point in the history
This value can not be relied on as it doesn't work for
multi-configuration generators. I don't think this undocumented option
is used much, if at all, so I think we should remove it.
  • Loading branch information
dundargoc committed Jan 30, 2023
1 parent 979b7b0 commit 27b81af
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 17 deletions.
5 changes: 0 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,6 @@ endif()
message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")

set_default_buildtype()
if(CMAKE_BUILD_TYPE MATCHES Debug)
set(DEBUG 1)
else()
set(DEBUG 0)
endif()

# If not in a git repo (e.g., a tarball) these tokens define the complete
# version string, else they are combined with the result of `git describe`.
Expand Down
2 changes: 0 additions & 2 deletions cmake.config/config.h.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#ifndef AUTO_CONFIG_H
#define AUTO_CONFIG_H

#cmakedefine DEBUG

#cmakedefine SIZEOF_INT @SIZEOF_INT@
#cmakedefine SIZEOF_INTMAX_T @SIZEOF_INTMAX_T@
#cmakedefine SIZEOF_INT32_T @SIZEOF_INT32_T@
Expand Down
11 changes: 4 additions & 7 deletions runtime/lua/nvim/health.lua
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,10 @@ local function check_performance()
health.report_ok(buildtype)
else
health.report_info(buildtype)
health.report_warn(
'Non-optimized ' .. (has('debug') and '(DEBUG) ' or '') .. 'build. Nvim will be slower.',
{
'Install a different Nvim package, or rebuild with `CMAKE_BUILD_TYPE=RelWithDebInfo`.',
suggest_faq,
}
)
health.report_warn('Non-optimized debug build. Nvim will be slower.', {
'Install a different Nvim package, or rebuild with `CMAKE_BUILD_TYPE=RelWithDebInfo`.',
suggest_faq,
})
end

-- check for slow shell invocation
Expand Down
3 changes: 0 additions & 3 deletions src/nvim/eval/funcs.c
Original file line number Diff line number Diff line change
Expand Up @@ -3064,9 +3064,6 @@ static void f_has(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
"conceal",
"cursorbind",
"cursorshape",
#ifdef DEBUG
"debug",
#endif
"dialog_con",
"diff",
"digraphs",
Expand Down

0 comments on commit 27b81af

Please sign in to comment.