diff options
| author | Andrew Kaster <akaster@serenityos.org> | 2021-08-31 20:38:34 -0600 |
|---|---|---|
| committer | Ali Mohammad Pur <Ali.mpfard@gmail.com> | 2021-09-15 19:04:52 +0430 |
| commit | b9e3647e668823aaedd3c6a63f6d0498b4544efd (patch) | |
| tree | 39d331cb0d52cba802f9a2d874deaa91b6248033 | |
| parent | 368d2ace551ee3900ab7351d1ffdef477821af1f (diff) | |
| download | serenity-b9e3647e668823aaedd3c6a63f6d0498b4544efd.zip | |
Meta+Toolchain: Rename CMAKE_CXXFILT to SERENITY_CXXFILT
The "CMAKE_<foo>" variable namespace is reserved, and CXXFILT is not
currently a variable known to upstream CMake.
| -rw-r--r-- | Kernel/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Toolchain/CMake/ClangToolchain.txt.in | 2 | ||||
| -rw-r--r-- | Toolchain/CMake/GNUToolchain.txt.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt index 83c3ee8015..e819ada537 100644 --- a/Kernel/CMakeLists.txt +++ b/Kernel/CMakeLists.txt @@ -481,7 +481,7 @@ endif() add_custom_command( TARGET Kernel POST_BUILD - COMMAND ${CMAKE_COMMAND} -E env CXXFILT=${CMAKE_CXXFILT} sh ${CMAKE_CURRENT_SOURCE_DIR}/mkmap.sh + COMMAND ${CMAKE_COMMAND} -E env CXXFILT=${SERENITY_CXXFILT} sh ${CMAKE_CURRENT_SOURCE_DIR}/mkmap.sh COMMAND ${CMAKE_COMMAND} -E env OBJCOPY=${CMAKE_OBJCOPY} sh ${CMAKE_CURRENT_SOURCE_DIR}/embedmap.sh COMMAND ${CMAKE_OBJCOPY} --only-keep-debug Kernel Kernel.debug COMMAND ${CMAKE_OBJCOPY} --strip-debug Kernel diff --git a/Toolchain/CMake/ClangToolchain.txt.in b/Toolchain/CMake/ClangToolchain.txt.in index 10f123bee9..8afcfa2b36 100644 --- a/Toolchain/CMake/ClangToolchain.txt.in +++ b/Toolchain/CMake/ClangToolchain.txt.in @@ -24,7 +24,7 @@ set(CMAKE_LINKER ${TOOLCHAIN_PATH}/ld.lld) set(CMAKE_RANLIB ${TOOLCHAIN_PATH}/llvm-ranlib) set(CMAKE_STRIP ${TOOLCHAIN_PATH}/llvm-strip) set(CMAKE_AR ${TOOLCHAIN_PATH}/llvm-ar) -set(CMAKE_CXXFILT ${TOOLCHAIN_PATH}/llvm-cxxfilt) +set(SERENITY_CXXFILT ${TOOLCHAIN_PATH}/llvm-cxxfilt) # FIXME: Persuade LLVM maintainers to add `--update-section` to llvm-objcopy, as it's required for the kernel symbol map. set(CMAKE_OBJCOPY ${TOOLCHAIN_ROOT}/binutils/bin/@SERENITY_ARCH@-pc-serenity-objcopy) diff --git a/Toolchain/CMake/GNUToolchain.txt.in b/Toolchain/CMake/GNUToolchain.txt.in index 9a0a2efdc8..eb7d3d6764 100644 --- a/Toolchain/CMake/GNUToolchain.txt.in +++ b/Toolchain/CMake/GNUToolchain.txt.in @@ -22,7 +22,7 @@ set(CMAKE_RANLIB ${TOOLCHAIN_PREFIX}gcc-ranlib) set(CMAKE_STRIP ${TOOLCHAIN_PREFIX}strip) set(CMAKE_AR ${TOOLCHAIN_PREFIX}gcc-ar) set(CMAKE_OBJCOPY ${TOOLCHAIN_PREFIX}objcopy) -set(CMAKE_CXXFILT ${TOOLCHAIN_PREFIX}c++filt) +set(SERENITY_CXXFILT ${TOOLCHAIN_PREFIX}c++filt) set(CMAKE_EXE_LINKER_FLAGS_INIT "-Wl,--hash-style=gnu,-z,relro,-z,now,-z,noexecstack,-z,max-page-size=0x1000,-z,separate-code") |