[llvm] Revert "[AIX][CMake] Use top-level tools in llvm_ExternalProject_Add" (PR #91019)
David Tenty via llvm-commits
llvm-commits at lists.llvm.org
Fri May 3 14:28:41 PDT 2024
https://github.com/daltenty created https://github.com/llvm/llvm-project/pull/91019
This reverts commit 11066449d49e20f18f46757df07455c6abcedcf1.
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.
>From f9d0b871e735ab9dda8265ff96ebe54f3c69f368 Mon Sep 17 00:00:00 2001
From: David Tenty <daltenty at ibm.com>
Date: Fri, 3 May 2024 17:18:57 -0400
Subject: [PATCH] Revert "[AIX][CMake] Use top-level tools in
llvm_ExternalProject_Add"
This reverts commit 11066449d49e20f18f46757df07455c6abcedcf1.
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.
---
llvm/cmake/modules/LLVMExternalProjectUtils.cmake | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/llvm/cmake/modules/LLVMExternalProjectUtils.cmake b/llvm/cmake/modules/LLVMExternalProjectUtils.cmake
index 2672f90f579bd9..c8016f20a819a9 100644
--- a/llvm/cmake/modules/LLVMExternalProjectUtils.cmake
+++ b/llvm/cmake/modules/LLVMExternalProjectUtils.cmake
@@ -261,7 +261,7 @@ function(llvm_ExternalProject_Add name source_dir)
set(sysroot_arg -DCMAKE_SYSROOT=${CMAKE_SYSROOT})
endif()
- if(CMAKE_CROSSCOMPILING OR _cmake_system_name STREQUAL AIX)
+ if(CMAKE_CROSSCOMPILING)
set(compiler_args -DCMAKE_ASM_COMPILER=${CMAKE_ASM_COMPILER}
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
@@ -273,8 +273,6 @@ function(llvm_ExternalProject_Add name source_dir)
-DCMAKE_OBJDUMP=${CMAKE_OBJDUMP}
-DCMAKE_STRIP=${CMAKE_STRIP}
-DCMAKE_READELF=${CMAKE_READELF})
- endif()
- if(CMAKE_CROSSCOMPILING)
set(llvm_config_path ${LLVM_CONFIG_PATH})
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
More information about the llvm-commits
mailing list