mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-14 18:36:35 +00:00
Code Issues Projects Releases Wiki Activity

Revert "[compiler-rt] Disable LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON on AIX. (#131200)" (#132574)

Browse Source 
…

This reverts commit 8e773d8a10cc996fbbe834f59ed9f7044c3539e0.
This commit is contained in:
Daniel Chen 2025-03-22 20:56:47 -04:00 committed by GitHub
parent f3f0b99b1c
commit f73da649cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler-rt/cmake/base-config-ix.cmake
View File

@ -109,7 +109,7 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" lib) extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" lib)
set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH
"Path where built compiler-rt libraries should be installed.") "Path where built compiler-rt libraries should be installed.")
else() else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
set(COMPILER_RT_OUTPUT_LIBRARY_DIR set(COMPILER_RT_OUTPUT_LIBRARY_DIR
${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR})
extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "lib/${COMPILER_RT_OS_DIR}") extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "lib/${COMPILER_RT_OS_DIR}")

13
llvm/CMakeLists.txt
View File

@ -1186,9 +1186,9 @@ endif()
# Build with _XOPEN_SOURCE on AIX, as stray macros in _ALL_SOURCE mode tend to # Build with _XOPEN_SOURCE on AIX, as stray macros in _ALL_SOURCE mode tend to
# break things. In this case we need to enable the large-file API as well. # break things. In this case we need to enable the large-file API as well.
if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHES "AIX") if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHES "AIX")
add_compile_definitions(_XOPEN_SOURCE=700) add_compile_definitions(_XOPEN_SOURCE=700)
add_compile_definitions(_LARGE_FILE_API) add_compile_definitions(_LARGE_FILE_API)
add_compile_options(-pthread) add_compile_options(-pthread)
# Modules should be built with -shared -Wl,-G, so we can use runtime linking # Modules should be built with -shared -Wl,-G, so we can use runtime linking
# with plugins. # with plugins.
@ -1196,13 +1196,6 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHES "AIX")
# Also set the correct flags for building shared libraries. # Also set the correct flags for building shared libraries.
string(APPEND CMAKE_SHARED_LINKER_FLAGS " -shared") string(APPEND CMAKE_SHARED_LINKER_FLAGS " -shared")
# Set LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF as AIX doesn't support it
if (LLVM_ENABLE_PER_TARGET_RUNTIME_DIR)
message(WARNING
"LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON is not supported on AIX. LLVM_ENABLE_PER_TARGET_RUNTIME_DIR is set to OFF.")
set(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR OFF CACHE BOOL "" FORCE)
endif()
endif() endif()
# Build with _XOPEN_SOURCE on z/OS. # Build with _XOPEN_SOURCE on z/OS.

7
runtimes/CMakeLists.txt
View File

@ -223,13 +223,6 @@ endif()
# This can be used to detect whether we're in the runtimes build. # This can be used to detect whether we're in the runtimes build.
set(LLVM_RUNTIMES_BUILD ON) set(LLVM_RUNTIMES_BUILD ON)
if (LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND UNIX AND ${CMAKE_SYSTEM_NAME} MATCHES "AIX")
# Set LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF as AIX doesn't support it
message(WARNING
"LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON is not supported on AIX. LLVM_ENABLE_PER_TARGET_RUNTIME_DIR is set to OFF.")
set(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR OFF CACHE BOOL "" FORCE)
endif()
foreach(entry ${runtimes}) foreach(entry ${runtimes})
get_filename_component(projName ${entry} NAME) get_filename_component(projName ${entry} NAME)