Skip to content

Commit 96d6399

Browse files
PiJoulesPiJoules
committed
Revert "[CMake] Use LLVM_TARGET_TRIPLE in runtimes"
This reverts commit bec8a37. This causes many of these errors to appear when rebuilding runtimes part of fuchsia's toolchain: ld.lld: error: /usr/local/google/home/paulkirth/llvm-upstream/build/lib/x86_64-unknown-linux-gnu/libunwind.a(libunwind.cpp.o) is incompatible with elf64-x86-64 This can be reproduced by making a complete toolchain, saving any source file with no changes, then rerunning ninja distribution.
1 parent 7358c29 commit 96d6399

File tree

13 files changed

+23
-23
lines changed

13 files changed

+23
-23
lines changed

‎compiler-rt/cmake/config-ix.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -689,8 +689,8 @@ else()
689689
set(CAN_SYMBOLIZE 1)
690690
endif()
691691

692-
find_program(GNU_LD_EXECUTABLE NAMES ${LLVM_TARGET_TRIPLE}-ld.bfd ld.bfd DOC "GNU ld")
693-
find_program(GOLD_EXECUTABLE NAMES ${LLVM_TARGET_TRIPLE}-ld.gold ld.gold DOC "GNU gold")
692+
find_program(GNU_LD_EXECUTABLE NAMES ${LLVM_DEFAULT_TARGET_TRIPLE}-ld.bfd ld.bfd DOC "GNU ld")
693+
find_program(GOLD_EXECUTABLE NAMES ${LLVM_DEFAULT_TARGET_TRIPLE}-ld.gold ld.gold DOC "GNU gold")
694694

695695
if(COMPILER_RT_SUPPORTED_ARCH)
696696
list(REMOVE_DUPLICATES COMPILER_RT_SUPPORTED_ARCH)

‎libc/lib/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set_target_properties(
1010
)
1111

1212
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR)
13-
set(LIBC_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_TARGET_TRIPLE})
13+
set(LIBC_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE})
1414
else()
1515
set(LIBC_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX})
1616
endif()

‎libcxx/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -413,12 +413,12 @@ set(LIBCXX_SHARED_OUTPUT_NAME "c++" CACHE STRING "Output name for the shared lib
413413
set(LIBCXX_STATIC_OUTPUT_NAME "c++" CACHE STRING "Output name for the static libc++ runtime library.")
414414

415415
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
416-
set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_TARGET_TRIPLE})
416+
set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE})
417417
set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1")
418-
set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LLVM_BINARY_DIR}/include/${LLVM_TARGET_TRIPLE}/c++/v1")
419-
set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_TARGET_TRIPLE} CACHE PATH
418+
set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LLVM_BINARY_DIR}/include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1")
419+
set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH
420420
"Path where built libc++ libraries should be installed.")
421-
set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_TARGET_TRIPLE}/c++/v1" CACHE PATH
421+
set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH
422422
"Path where target-specific libc++ headers should be installed.")
423423
if(LIBCXX_LIBDIR_SUBDIR)
424424
string(APPEND LIBCXX_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR})

‎libcxx/docs/BuildingLibcxx.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ libc++ specific options
281281
.. option:: LIBCXX_INSTALL_INCLUDE_TARGET_DIR:PATH
282282

283283
**Default**: ``include/c++/v1`` or
284-
``include/${LLVM_TARGET_TRIPLE}/c++/v1``
284+
``include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1``
285285

286286
Path where target-specific libc++ headers should be installed. If a relative
287287
path, relative to ``CMAKE_INSTALL_PREFIX``.

‎libcxx/lib/abi/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ endfunction()
4343
if (CMAKE_CXX_COMPILER_TARGET)
4444
set(triple "${CMAKE_CXX_COMPILER_TARGET}")
4545
else()
46-
set(triple "${LLVM_TARGET_TRIPLE}")
46+
set(triple "${LLVM_DEFAULT_TARGET_TRIPLE}")
4747
endif()
4848
cxx_abi_list_identifier(abi_list_identifier
4949
"${triple}"

‎libcxx/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ endif()
2929
if (CMAKE_CXX_COMPILER_TARGET)
3030
serialize_lit_param(target_triple "\"${CMAKE_CXX_COMPILER_TARGET}\"")
3131
else()
32-
serialize_lit_param(target_triple "\"${LLVM_TARGET_TRIPLE}\"")
32+
serialize_lit_param(target_triple "\"${LLVM_DEFAULT_TARGET_TRIPLE}\"")
3333
endif()
3434

3535
if (LLVM_USE_SANITIZER)

‎libcxxabi/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
189189

190190
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
191191
set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR})
192-
set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_TARGET_TRIPLE})
193-
set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_TARGET_TRIPLE} CACHE PATH
192+
set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE})
193+
set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH
194194
"Path where built libc++abi libraries should be installed.")
195195
if(LIBCXX_LIBDIR_SUBDIR)
196196
string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR})

‎libcxxabi/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ endif()
5050
if (CMAKE_CXX_COMPILER_TARGET)
5151
serialize_lit_param(target_triple "\"${CMAKE_CXX_COMPILER_TARGET}\"")
5252
else()
53-
serialize_lit_param(target_triple "\"${LLVM_TARGET_TRIPLE}\"")
53+
serialize_lit_param(target_triple "\"${LLVM_DEFAULT_TARGET_TRIPLE}\"")
5454
endif()
5555

5656
foreach(param IN LISTS LIBCXXABI_TEST_PARAMS)

‎libunwind/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ set(LIBUNWIND_SHARED_OUTPUT_NAME "unwind" CACHE STRING "Output name for the shar
115115
set(LIBUNWIND_STATIC_OUTPUT_NAME "unwind" CACHE STRING "Output name for the static libunwind runtime library.")
116116

117117
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
118-
set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_TARGET_TRIPLE})
119-
set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_TARGET_TRIPLE} CACHE PATH
118+
set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE})
119+
set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH
120120
"Path where built libunwind libraries should be installed.")
121121
if(LIBCXX_LIBDIR_SUBDIR)
122122
string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR})

‎libunwind/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ endif()
2929
if (CMAKE_CXX_COMPILER_TARGET)
3030
serialize_lit_param(target_triple "\"${CMAKE_CXX_COMPILER_TARGET}\"")
3131
else()
32-
serialize_lit_param(target_triple "\"${LLVM_TARGET_TRIPLE}\"")
32+
serialize_lit_param(target_triple "\"${LLVM_DEFAULT_TARGET_TRIPLE}\"")
3333
endif()
3434

3535
foreach(param IN LISTS LIBUNWIND_TEST_PARAMS)

‎llvm/cmake/modules/LLVMExternalProjectUtils.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ function(llvm_ExternalProject_Add name source_dir)
7878
endif()
7979

8080
if(NOT ARG_TARGET_TRIPLE)
81-
set(target_triple ${LLVM_TARGET_TRIPLE})
81+
set(target_triple ${LLVM_DEFAULT_TARGET_TRIPLE})
8282
else()
8383
set(target_triple ${ARG_TARGET_TRIPLE})
8484
endif()

‎llvm/runtimes/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ function(builtin_default_target compiler_rt_path)
7474
DEPENDS ${ARG_DEPENDS}
7575
CMAKE_ARGS -DLLVM_LIBRARY_OUTPUT_INTDIR=${LLVM_LIBRARY_DIR}
7676
-DLLVM_RUNTIME_OUTPUT_INTDIR=${LLVM_TOOLS_BINARY_DIR}
77-
-DLLVM_TARGET_TRIPLE=${LLVM_TARGET_TRIPLE}
77+
-DLLVM_DEFAULT_TARGET_TRIPLE=${LLVM_TARGET_TRIPLE}
7878
-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR_default}
7979
-DCMAKE_C_COMPILER_WORKS=ON
8080
-DCMAKE_ASM_COMPILER_WORKS=ON
@@ -108,7 +108,7 @@ function(builtin_register_target compiler_rt_path target)
108108
DEPENDS ${ARG_DEPENDS}
109109
CMAKE_ARGS -DLLVM_LIBRARY_OUTPUT_INTDIR=${LLVM_LIBRARY_DIR}
110110
-DLLVM_RUNTIME_OUTPUT_INTDIR=${LLVM_TOOLS_BINARY_DIR}
111-
-DLLVM_TARGET_TRIPLE=${target}
111+
-DLLVM_DEFAULT_TARGET_TRIPLE=${target}
112112
-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
113113
-DCMAKE_C_COMPILER_WORKS=ON
114114
-DCMAKE_ASM_COMPILER_WORKS=ON
@@ -228,7 +228,7 @@ function(runtime_default_target)
228228
# Builtins were built separately above
229229
CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
230230
-DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
231-
-DLLVM_TARGET_TRIPLE=${LLVM_TARGET_TRIPLE}
231+
-DLLVM_DEFAULT_TARGET_TRIPLE=${LLVM_TARGET_TRIPLE}
232232
-DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED}
233233
-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR_default}
234234
-DLLVM_BUILD_TOOLS=${LLVM_BUILD_TOOLS}
@@ -353,7 +353,7 @@ function(runtime_register_target name target)
353353
# Builtins were built separately above
354354
CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
355355
-DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
356-
-DLLVM_TARGET_TRIPLE=${target}
356+
-DLLVM_DEFAULT_TARGET_TRIPLE=${target}
357357
-DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED}
358358
-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
359359
-DCMAKE_C_COMPILER_WORKS=ON

‎runtimes/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ find_package(Python3 REQUIRED COMPONENTS Interpreter)
154154
# Host triple is used by tests to check if they are running natively.
155155
include(GetHostTriple)
156156
get_host_triple(LLVM_HOST_TRIPLE)
157-
set(LLVM_TARGET_TRIPLE "${LLVM_HOST_TRIPLE}" CACHE STRING
158-
"Target for which the runtimes will be built.")
157+
set(LLVM_DEFAULT_TARGET_TRIPLE "${LLVM_HOST_TRIPLE}" CACHE STRING
158+
"Default target for which the runtimes will be built.")
159159

160160
option(LLVM_INCLUDE_TESTS "Generate build targets for the runtimes unit tests." ON)
161161
option(LLVM_INCLUDE_DOCS "Generate build targets for the runtimes documentation." ON)

0 commit comments

Comments
 (0)