Skip to content

Commit 6f8d62d

Browse files
committed
Fix CMake configuration errors on OS X
llvm-svn: 296954
1 parent 054c35c commit 6f8d62d

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

libcxxabi/CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -416,13 +416,16 @@ if (LIBCXXABI_HAS_EXTERNAL_THREAD_API)
416416
endif()
417417
endif()
418418

419-
set(LIBCXXABI_HAS_UNDEFINED_SYMBOLS ((NOT LIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS)
420-
OR (LIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY AND LIBCXXABI_ENABLE_SHARED)))
419+
set(LIBCXXABI_HAS_UNDEFINED_SYMBOLS OFF)
420+
if ((NOT LIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS)
421+
OR (LIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY AND LIBCXXABI_ENABLE_SHARED))
422+
set(LIBCXXABI_HAS_UNDEFINED_SYMBOLS ON)
423+
endif()
421424

422425
if (LIBCXXABI_HAS_UNDEFINED_SYMBOLS)
423426
# Need to allow unresolved symbols if this is to work with shared library builds
424427
if (APPLE)
425-
add_link_flags("-undefined dynamic_lookup")
428+
list(APPEND LIBCXXABI_LINK_FLAGS "-undefined dynamic_lookup")
426429
else()
427430
# Relax this restriction from HandleLLVMOptions
428431
string(REPLACE "-Wl,-z,defs" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")

0 commit comments

Comments
 (0)