diff options
author | Alex Brachet <abrachet@google.com> | 2023-05-30 18:19:00 +0000 |
---|---|---|
committer | Alex Brachet <abrachet@google.com> | 2023-05-30 18:19:36 +0000 |
commit | a2a51448c1c34ee1cd1c3ec3689e7a354bb0df7c (patch) | |
tree | 3425c00de1ddc81e2b0f0806bf3ac4f7e692d515 | |
parent | e557b8a14247ad58ec20ff82612de852155f77ad (diff) | |
download | llvm-a2a51448c1c34ee1cd1c3ec3689e7a354bb0df7c.zip llvm-a2a51448c1c34ee1cd1c3ec3689e7a354bb0df7c.tar.gz llvm-a2a51448c1c34ee1cd1c3ec3689e7a354bb0df7c.tar.bz2 |
[compiler-rt][bultins] Fix libatomic standalone build
Differential Revision: https://reviews.llvm.org/D151679
-rw-r--r-- | compiler-rt/lib/builtins/CMakeLists.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt index c3e22a8..66d1193 100644 --- a/compiler-rt/lib/builtins/CMakeLists.txt +++ b/compiler-rt/lib/builtins/CMakeLists.txt @@ -861,19 +861,17 @@ option(COMPILER_RT_BUILD_STANDALONE_LIBATOMIC if(COMPILER_RT_BUILD_STANDALONE_LIBATOMIC) add_custom_target(builtins-standalone-atomic) - set(BUILTIN_DEPS "") set(BUILTIN_TYPE SHARED) if(${CMAKE_SYSTEM_NAME} MATCHES "AIX") if(NOT COMPILER_RT_LIBATOMIC_LINK_FLAGS) get_aix_libatomic_default_link_flags(COMPILER_RT_LIBATOMIC_LINK_FLAGS "${CMAKE_CURRENT_SOURCE_DIR}/ppc/atomic.exp") endif() - # The compiler needs builtins to link any other binaries, so let - # clang_rt.atomic be built after builtins. - set(BUILTIN_DEPS builtins) # For different versions of cmake, SHARED behaves differently. For some # versions, we might need MODULE rather than SHARED. get_aix_libatomic_type(BUILTIN_TYPE) + else() + list(APPEND COMPILER_RT_LIBATOMIC_LINK_FLAGS -nodefaultlibs) endif() foreach (arch ${BUILTIN_SUPPORTED_ARCH}) if(CAN_TARGET_${arch}) @@ -882,7 +880,7 @@ if(COMPILER_RT_BUILD_STANDALONE_LIBATOMIC) ARCHS ${arch} SOURCES atomic.c LINK_FLAGS ${COMPILER_RT_LIBATOMIC_LINK_FLAGS} - DEPS ${BUILTIN_DEPS} + DEPS builtins PARENT_TARGET builtins-standalone-atomic) endif() endforeach() |