File tree Expand file tree Collapse file tree 4 files changed +7
-4
lines changed Expand file tree Collapse file tree 4 files changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -9,7 +9,8 @@ add_library(swiftDemangling OBJECT
99 "${SwiftCore_SWIFTC_SOURCE_DIR} /lib/Demangling/Remangler.cpp"
1010 "${SwiftCore_SWIFTC_SOURCE_DIR} /lib/Demangling/NodeDumper.cpp"
1111 "${SwiftCore_SWIFTC_SOURCE_DIR} /lib/Demangling/Errors.cpp" )
12- target_compile_definitions (swiftDemangling PRIVATE swiftCore_EXPORTS
12+ target_compile_definitions (swiftDemangling PRIVATE
13+ $<$<BOOL :${BUILD_SHARED_LIBS} >:-DswiftCore_EXPORTS>
1314 $<$<BOOL :${SwiftCore_ENABLE_OBJC_INTEROP} >:-DSWIFT_SUPPORT_OLD_MANGLING>
1415 $<$<BOOL :${SwiftCore_ENABLE_TYPE_PRINTING} >:-DSWIFT_STDLIB_HAS_TYPE_PRINTING>
1516 $<$<BOOL :${SwiftCore_ENABLE_CRASH_REPORTER_CLIENT} >:-DSWIFT_HAVE_CRASHREPORTERCLIENT>)
Original file line number Diff line number Diff line change @@ -306,7 +306,7 @@ target_compile_definitions(swiftCore PRIVATE
306306 $<$<BOOL :${SwiftCore_ENABLE_COMPACT_ABSOLUTE_FUNCTION_POINTERS} >:-DSWIFT_COMPACT_ABSOLUTE_FUNCTION_POINTER>
307307 $<$<COMPILE_LANGUAGE:C,CX>:-DSWIFT_TARGET_LIBRARY_NAME=swiftCore>)
308308target_compile_options (swiftCore PRIVATE
309- "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xcc -DswiftCore_EXPORTS>" )
309+ "$<$<AND:$<BOOL: ${BUILD_SHARED_LIBS} >,$< COMPILE_LANGUAGE:Swift> >:SHELL:-Xcc -DswiftCore_EXPORTS>" )
310310
311311target_link_libraries (swiftCore PRIVATE swiftShims)
312312target_link_libraries (swiftCore
Original file line number Diff line number Diff line change @@ -76,9 +76,9 @@ endif()
7676# file rather than pushing them through macro flags.
7777target_compile_definitions (swiftRuntime
7878 PRIVATE
79- -DswiftCore_EXPORTS
8079 -DSWIFT_RUNTIME
8180 -DSWIFT_TARGET_LIBRARY_NAME=swiftRuntime
81+ $<$<BOOL :${BUILD_SHARED_LIBS} >:-DswiftCore_EXPORTS>
8282 $<$<BOOL :${SwiftCore_ENABLE_BACKTRACING} >:-DSWIFT_ENABLE_BACKTRACING>
8383 $<$<BOOL :${SwiftCore_ENABLE_OVERRIDABLE_RETAIN_RELEASE} >:-DSWIFT_STDLIB_OVERRIDABLE_RETAIN_RELEASE>
8484 $<$<BOOL :${SwiftCore_ENABLE_MALLOC_TYPE} >:-DSWIFT_STDLIB_HAS_MALLOC_TYPE>
Original file line number Diff line number Diff line change @@ -27,8 +27,10 @@ endif()
2727
2828
2929target_compile_definitions (swiftStdlibStubs PRIVATE
30- swiftCore_EXPORTS
30+ $<$< BOOL : ${BUILD_SHARED_LIBS} >:-DswiftCore_EXPORTS>
3131 $<$<BOOL :${SwiftCore_ENABLE_UNICODE_DATA} >:-DSWIFT_STDLIB_ENABLE_UNICODE_DATA>)
32+
33+
3234target_link_libraries (swiftStdlibStubs PRIVATE swiftShims)
3335target_include_directories (swiftStdlibStubs PRIVATE
3436 "${PROJECT_BINARY_DIR} /include"
You can’t perform that action at this time.
0 commit comments