commit 772af24cb3a54a67a5f7abb885d9943a2544893f
author Leonard Chan <leonardchan@google.com> Mon Dec 05 22:20:51 2022 +0000
committer Copybara-Service <copybara-worker@google.com> Mon Dec 05 14:26:04 2022 -0800
tree 84914656660754b377b7c2a3118bfdad0c5fefe0
parent c0fa08cfe9e2c9d32e834541fcfcb0c24a1ff05c

Revert "[CMake] Use LLVM_TARGET_TRIPLE in runtimes"

This reverts commit bec8a372fc0db95852748691c0f4933044026b25.

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.

GitOrigin-RevId: 96d63993dd3698bbf2d6a83c035cd05faed7317b

cmake/config-ix.cmake

diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index 9eb48b8..fd7daa5 100644
--- a/cmake/config-ix.cmake
+++ b/cmake/config-ix.cmake
@@ -689,8 +689,8 @@
   set(CAN_SYMBOLIZE 1)
 endif()
 
-find_program(GNU_LD_EXECUTABLE NAMES ${LLVM_TARGET_TRIPLE}-ld.bfd ld.bfd DOC "GNU ld")
-find_program(GOLD_EXECUTABLE NAMES ${LLVM_TARGET_TRIPLE}-ld.gold ld.gold DOC "GNU gold")
+find_program(GNU_LD_EXECUTABLE NAMES ${LLVM_DEFAULT_TARGET_TRIPLE}-ld.bfd ld.bfd DOC "GNU ld")
+find_program(GOLD_EXECUTABLE NAMES ${LLVM_DEFAULT_TARGET_TRIPLE}-ld.gold ld.gold DOC "GNU gold")
 
 if(COMPILER_RT_SUPPORTED_ARCH)
   list(REMOVE_DUPLICATES COMPILER_RT_SUPPORTED_ARCH)