diff options
| author | Louis Dionne <ldionne.2@gmail.com> | 2021-10-12 15:59:08 -0400 |
|---|---|---|
| committer | Louis Dionne <ldionne.2@gmail.com> | 2021-10-21 10:06:11 -0400 |
| commit | 72117f2ffeb6a096a808c34ec7ebee122c2d2e21 (patch) | |
| tree | 6e48668059ca37f13d97944e34a9ff0dffc898a7 /libunwind | |
| parent | aa3519f178fc6ea563f950a4077b34d8dc6c4470 (diff) | |
| download | llvm-72117f2ffeb6a096a808c34ec7ebee122c2d2e21.zip llvm-72117f2ffeb6a096a808c34ec7ebee122c2d2e21.tar.gz llvm-72117f2ffeb6a096a808c34ec7ebee122c2d2e21.tar.bz2 | |
[runtimes] Properly handle the sysroot/triple/gcc-toolchain
In 395271a, I simplified how we handled the target triple for the
runtimes. However, in doing so, we stopped considering the default
in CMAKE_CXX_COMPILER_TARGET, so we'd use the LLVM_DEFAULT_TARGET_TRIPLE
(which is the host triple) even if CMAKE_CXX_COMPILER_TARGET was specified.
This commit fixes that problem and also refactors the code so that it's
easy to see what the default value is.
The fact that nobody seems to have been broken by this makes me think
that perhaps nobody is using CMAKE_CXX_COMPILER_TARGET to specify the
triple -- but it should still work.
Differential Revision: https://reviews.llvm.org/D111672
Diffstat (limited to 'libunwind')
| -rw-r--r-- | libunwind/CMakeLists.txt | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt index 59d489b..6643eee 100644 --- a/libunwind/CMakeLists.txt +++ b/libunwind/CMakeLists.txt @@ -80,9 +80,14 @@ cmake_dependent_option(LIBUNWIND_INSTALL_STATIC_LIBRARY cmake_dependent_option(LIBUNWIND_INSTALL_SHARED_LIBRARY "Install the shared libunwind library." ON "LIBUNWIND_ENABLE_SHARED;LIBUNWIND_INSTALL_LIBRARY" OFF) -set(LIBUNWIND_TARGET_TRIPLE "${LLVM_DEFAULT_TARGET_TRIPLE}" CACHE STRING "Target triple for cross compiling.") -set(LIBUNWIND_GCC_TOOLCHAIN "" CACHE PATH "GCC toolchain for cross compiling.") -set(LIBUNWIND_SYSROOT "" CACHE PATH "Sysroot for cross compiling.") +if(CMAKE_CXX_COMPILER_TARGET) + set(LIBUNWIND_DEFAULT_TARGET_TRIPLE "${CMAKE_CXX_COMPILER_TARGET}") +else() + set(LIBUNWIND_DEFAULT_TARGET_TRIPLE "${LLVM_DEFAULT_TARGET_TRIPLE}") +endif() +set(LIBUNWIND_TARGET_TRIPLE "${LIBUNWIND_DEFAULT_TARGET_TRIPLE}" CACHE STRING "Target triple for cross compiling.") +set(LIBUNWIND_GCC_TOOLCHAIN "${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}" CACHE PATH "GCC toolchain for cross compiling.") +set(LIBUNWIND_SYSROOT "${CMAKE_SYSROOT}" CACHE PATH "Sysroot for cross compiling.") set(LIBUNWIND_TEST_LINKER_FLAGS "" CACHE STRING "Additional linker flags for test programs.") set(LIBUNWIND_TEST_COMPILER_FLAGS "" CACHE STRING @@ -170,18 +175,12 @@ add_target_flags_if(LIBUNWIND_BUILD_32_BITS "-m32") if(LIBUNWIND_TARGET_TRIPLE) add_target_flags_if_supported("--target=${LIBUNWIND_TARGET_TRIPLE}") -elseif(CMAKE_CXX_COMPILER_TARGET) - set(LIBUNWIND_TARGET_TRIPLE "${CMAKE_CXX_COMPILER_TARGET}") endif() if(LIBUNWIND_GCC_TOOLCHAIN) add_target_flags_if_supported("--gcc-toolchain=${LIBUNWIND_GCC_TOOLCHAIN}") -elseif(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN) - set(LIBUNWIND_GCC_TOOLCHAIN "${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}") endif() if(LIBUNWIND_SYSROOT) add_target_flags_if_supported("--sysroot=${LIBUNWIND_SYSROOT}") -elseif(CMAKE_SYSROOT) - set(LIBUNWIND_SYSROOT "${CMAKE_SYSROOT}") endif() # Configure compiler. |