[runtimes] NFCI: Drop intermediate CMake variable TARGET_TRIPLE

We might as well use the various XXX_TARGET_TRIPLE variables directly.
This commit is contained in:
Louis Dionne
2021-07-14 10:49:28 -04:00
parent 93dc73b1e0
commit 77396bbc98
7 changed files with 7 additions and 19 deletions

View File

@@ -480,10 +480,6 @@ elseif(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN)
set(LIBCXX_GCC_TOOLCHAIN "${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")
endif()
if(LIBCXX_TARGET_TRIPLE)
set(TARGET_TRIPLE "${LIBCXX_TARGET_TRIPLE}")
endif()
# Configure compiler.
include(config-ix)

View File

@@ -41,7 +41,7 @@ function(cxx_abi_list_identifier result triple abi_library abi_version unstable
endfunction()
cxx_abi_list_identifier(abi_list_identifier
"${TARGET_TRIPLE}"
"${LIBCXX_TARGET_TRIPLE}"
"${LIBCXX_CXX_ABI_LIBNAME}"
"${LIBCXX_ABI_VERSION}"
"${LIBCXX_ABI_UNSTABLE}"

View File

@@ -105,8 +105,8 @@ if (NOT LIBCXX_ENABLE_DEBUG_MODE_SUPPORT)
serialize_lit_param(enable_debug_tests False)
endif()
if (TARGET_TRIPLE)
serialize_lit_param(target_triple "\"${TARGET_TRIPLE}\"")
if (LIBCXX_TARGET_TRIPLE)
serialize_lit_param(target_triple "\"${LIBCXX_TARGET_TRIPLE}\"")
endif()
if (LLVM_USE_SANITIZER)

View File

@@ -273,10 +273,6 @@ elseif(CMAKE_SYSROOT)
set(LIBCXXABI_SYSROOT "${CMAKE_SYSROOT}")
endif()
if (LIBCXXABI_TARGET_TRIPLE)
set(TARGET_TRIPLE "${LIBCXXABI_TARGET_TRIPLE}")
endif()
# Configure compiler. Must happen after setting the target flags.
include(config-ix)

View File

@@ -86,8 +86,8 @@ if (LLVM_USE_SANITIZER)
serialize_lit_param(use_sanitizer "\"${LLVM_USE_SANITIZER}\"")
endif()
if (TARGET_TRIPLE)
serialize_lit_param(target_triple "\"${TARGET_TRIPLE}\"")
if (LIBCXXABI_TARGET_TRIPLE)
serialize_lit_param(target_triple "\"${LIBCXXABI_TARGET_TRIPLE}\"")
endif()
if (LIBCXXABI_BUILD_32_BITS)

View File

@@ -167,10 +167,6 @@ elseif(CMAKE_SYSROOT)
set(LIBUNWIND_SYSROOT "${CMAKE_SYSROOT}")
endif()
if (LIBUNWIND_TARGET_TRIPLE)
set(TARGET_TRIPLE "${LIBUNWIND_TARGET_TRIPLE}")
endif()
# Configure compiler.
include(config-ix)

View File

@@ -36,8 +36,8 @@ if (LLVM_USE_SANITIZER)
serialize_lit_param(use_sanitizer "\"${LLVM_USE_SANITIZER}\"")
endif()
if (TARGET_TRIPLE)
serialize_lit_param(target_triple "\"${TARGET_TRIPLE}\"")
if (LIBUNWIND_TARGET_TRIPLE)
serialize_lit_param(target_triple "\"${LIBUNWIND_TARGET_TRIPLE}\"")
endif()
if (LIBUNWIND_BUILD_32_BITS)