File tree 4 files changed +16
-21
lines changed
4 files changed +16
-21
lines changed Original file line number Diff line number Diff line change @@ -875,16 +875,19 @@ include(config-ix)
875
875
# invocation time. Except on 64-bit AIX, where the system toolchain
876
876
# expect 32-bit objects by default.
877
877
if ("${LLVM_HOST_TRIPLE} " MATCHES "^powerpc64-ibm-aix" )
878
- string (REGEX REPLACE "^powerpc64" "powerpc" LLVM_DEFAULT_TARGET_TRIPLE_default "${LLVM_HOST_TRIPLE} " )
878
+ string (REGEX REPLACE "^powerpc64" "powerpc" LLVM_DEFAULT_TARGET_TRIPLE_DEFAULT "${LLVM_HOST_TRIPLE} " )
879
879
else ()
880
880
# Only set default triple when native target is enabled.
881
881
if (LLVM_NATIVE_TARGET)
882
- set (LLVM_DEFAULT_TARGET_TRIPLE_default "${LLVM_HOST_TRIPLE} " )
882
+ set (LLVM_DEFAULT_TARGET_TRIPLE_DEFAULT "${LLVM_HOST_TRIPLE} " )
883
883
endif ()
884
884
endif ()
885
885
886
- include (SetTargetTriple)
887
- set_llvm_target_triple()
886
+ set (LLVM_DEFAULT_TARGET_TRIPLE "${LLVM_DEFAULT_TARGET_TRIPLE_DEFAULT} " CACHE STRING
887
+ "Default target for which LLVM will generate code." )
888
+ message (STATUS "LLVM default target triple: ${LLVM_DEFAULT_TARGET_TRIPLE} " )
889
+
890
+ set (LLVM_TARGET_TRIPLE "${LLVM_DEFAULT_TARGET_TRIPLE} " )
888
891
889
892
if (WIN32 OR CYGWIN )
890
893
if (BUILD_SHARED_LIBS OR LLVM_BUILD_LLVM_DYLIB)
Original file line number Diff line number Diff line change @@ -461,6 +461,7 @@ get_host_triple(LLVM_INFERRED_HOST_TRIPLE)
461
461
462
462
set (LLVM_HOST_TRIPLE "${LLVM_INFERRED_HOST_TRIPLE} " CACHE STRING
463
463
"Host on which LLVM binaries will run" )
464
+ message (STATUS "LLVM host triple: ${LLVM_HOST_TRIPLE} " )
464
465
465
466
# Determine the native architecture.
466
467
string (TOLOWER "${LLVM_TARGET_ARCH} " LLVM_NATIVE_ARCH)
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -160,8 +160,15 @@ find_package(Python3 REQUIRED COMPONENTS Interpreter)
160
160
# Host triple is used by tests to check if they are running natively.
161
161
include (GetHostTriple)
162
162
get_host_triple(LLVM_HOST_TRIPLE)
163
+ message (STATUS "LLVM host triple: ${LLVM_HOST_TRIPLE} " )
164
+
165
+ # TODO: We shouldn't be using LLVM_DEFAULT_TARGET_TRIPLE for runtimes since we
166
+ # aren't generating code, LLVM_TARGET_TRIPLE is a better fit.
163
167
set (LLVM_DEFAULT_TARGET_TRIPLE "${LLVM_HOST_TRIPLE} " CACHE STRING
164
- "Default target for which the runtimes will be built." )
168
+ "Default target for which the runtimes will be built." )
169
+ message (STATUS "LLVM default target triple: ${LLVM_DEFAULT_TARGET_TRIPLE} " )
170
+
171
+ set (LLVM_TARGET_TRIPLE "${LLVM_DEFAULT_TARGET_TRIPLE} " )
165
172
166
173
option (LLVM_INCLUDE_TESTS "Generate build targets for the runtimes unit tests." ON )
167
174
option (LLVM_INCLUDE_DOCS "Generate build targets for the runtimes documentation." ON )
@@ -175,9 +182,6 @@ endif()
175
182
# This can be used to detect whether we're in the runtimes build.
176
183
set (LLVM_RUNTIMES_BUILD ON )
177
184
178
- include (SetTargetTriple)
179
- set_llvm_target_triple()
180
-
181
185
foreach (entry ${runtimes} )
182
186
get_filename_component (projName ${entry} NAME )
183
187
You can’t perform that action at this time.
0 commit comments