diff options
| author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2023-01-08 11:01:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-08 11:01:24 +0100 |
| commit | 266a1c61b97313f2a516140fc691dd8be8eed47a (patch) | |
| tree | d287c38ff4dda25a7693abd80f975cb4cc9130ea | |
| parent | d1b3611f03625467500195b38d3c4646a7bc81db (diff) | |
| parent | 50687e60ae66aaef1799db1c17889d8e7c6c5157 (diff) | |
| download | rneovim-266a1c61b97313f2a516140fc691dd8be8eed47a.tar.gz rneovim-266a1c61b97313f2a516140fc691dd8be8eed47a.tar.bz2 rneovim-266a1c61b97313f2a516140fc691dd8be8eed47a.zip | |
Merge pull request #21678 from dundargoc/build/remove-old-workarounds
build: remove old cmake workarounds that aren't necessary anymore
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rwxr-xr-x | src/nvim/CMakeLists.txt | 18 |
2 files changed, 4 insertions, 24 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cb5cb09595..9eb701dd3f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -414,16 +414,6 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") add_definitions(-D_GNU_SOURCE) endif() -if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT PREFER_LUA AND LUAJIT_VERSION LESS "2.1.0-beta3") - # Required for luajit < 2.1.0-beta3. - set(CMAKE_EXE_LINKER_FLAGS - "${CMAKE_EXE_LINKER_FLAGS} -pagezero_size 10000 -image_base 100000000") - set(CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -image_base 100000000") - set(CMAKE_MODULE_LINKER_FLAGS - "${CMAKE_MODULE_LINKER_FLAGS} -image_base 100000000") -endif() - include_directories("${PROJECT_BINARY_DIR}/cmake.config") include_directories("${PROJECT_SOURCE_DIR}/src") diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index 8ac52d8b72..ac982e8be8 100755 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -624,21 +624,11 @@ endif() if(CLANG_ASAN_UBSAN) message(STATUS "Enabling Clang address sanitizer and undefined behavior sanitizer for nvim.") - check_c_compiler_flag(-fno-sanitize-recover=all SANITIZE_RECOVER_ALL) - if(SANITIZE_RECOVER_ALL) - if(CI_BUILD) - # Try to recover from all sanitize issues so we get reports about all failures - set(SANITIZE_RECOVER -fsanitize-recover=all) # Clang 3.6+ - else() - set(SANITIZE_RECOVER -fno-sanitize-recover=all) # Clang 3.6+ - endif() + if(CI_BUILD) + # Try to recover from all sanitize issues so we get reports about all failures + set(SANITIZE_RECOVER -fsanitize-recover=all) else() - if(CI_BUILD) - # Try to recover from all sanitize issues so we get reports about all failures - set(SANITIZE_RECOVER -fsanitize-recover) # Clang 3.5- - else() - set(SANITIZE_RECOVER -fno-sanitize-recover) # Clang 3.5- - endif() + set(SANITIZE_RECOVER -fno-sanitize-recover=all) endif() set_property(TARGET nvim APPEND PROPERTY COMPILE_OPTIONS ${SANITIZE_RECOVER} -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize=address -fsanitize=undefined -fsanitize-blacklist=${PROJECT_SOURCE_DIR}/src/.asan-blacklist) set_property(TARGET nvim APPEND_STRING PROPERTY LINK_FLAGS "-fsanitize=address -fsanitize=undefined ") |