Skip to content

Commit 1b22eca

Browse files
authored
Revert "[AIX][CMake] Use top-level tools in llvm_ExternalProject_Add" (#91019)
This reverts commit 1106644. As noted in the original patch, this was designed to reverted once https://reviews.llvm.org/D142479 and https://reviews.llvm.org/D142660 landed, which has long since happened.
1 parent 7b040d0 commit 1b22eca

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

llvm/cmake/modules/LLVMExternalProjectUtils.cmake

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ function(llvm_ExternalProject_Add name source_dir)
261261
set(sysroot_arg -DCMAKE_SYSROOT=${CMAKE_SYSROOT})
262262
endif()
263263

264-
if(CMAKE_CROSSCOMPILING OR _cmake_system_name STREQUAL AIX)
264+
if(CMAKE_CROSSCOMPILING)
265265
set(compiler_args -DCMAKE_ASM_COMPILER=${CMAKE_ASM_COMPILER}
266266
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
267267
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
@@ -273,8 +273,6 @@ function(llvm_ExternalProject_Add name source_dir)
273273
-DCMAKE_OBJDUMP=${CMAKE_OBJDUMP}
274274
-DCMAKE_STRIP=${CMAKE_STRIP}
275275
-DCMAKE_READELF=${CMAKE_READELF})
276-
endif()
277-
if(CMAKE_CROSSCOMPILING)
278276
set(llvm_config_path ${LLVM_CONFIG_PATH})
279277

280278
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")

0 commit comments

Comments
 (0)