Skip to content

Commit d7d85bb

Browse files
authored
Merge pull request swiftlang#78455 from etcwilde/ewilde/stdlib-rebuild-has-asl
CMake: SwiftCore: `SWIFT_STDLIB_HAS_ASL`
2 parents 8f6ad4c + db5ed99 commit d7d85bb

File tree

4 files changed

+7
-1
lines changed

4 files changed

+7
-1
lines changed

Runtimes/Core/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ include(PlatformInfo)
7070
include(gyb)
7171
include(Plist)
7272

73+
check_symbol_exists("asl_log" "asl.h" SwiftCore_HAS_ASL)
7374
check_symbol_exists("dladdr" "dlfcn.h" SwiftCore_HAS_DLADDR)
7475
check_symbol_exists("dlsym" "dlfcn.h" SwiftCore_HAS_DLSYM)
7576

Runtimes/Core/Demangling/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ target_compile_definitions(swiftDemangling PRIVATE
1313
$<$<BOOL:${BUILD_SHARED_LIBS}>:-DswiftCore_EXPORTS>
1414
$<$<BOOL:${SwiftCore_ENABLE_OBJC_INTEROP}>:-DSWIFT_SUPPORT_OLD_MANGLING>
1515
$<$<BOOL:${SwiftCore_ENABLE_TYPE_PRINTING}>:-DSWIFT_STDLIB_HAS_TYPE_PRINTING>
16-
$<$<BOOL:${SwiftCore_ENABLE_CRASH_REPORTER_CLIENT}>:-DSWIFT_HAVE_CRASHREPORTERCLIENT>)
16+
$<$<BOOL:${SwiftCore_ENABLE_CRASH_REPORTER_CLIENT}>:-DSWIFT_HAVE_CRASHREPORTERCLIENT>
17+
$<$<BOOL:${SwiftCore_HAS_ASL}>:-DSWIFT_STDLIB_HAS_ASL>)
1718

1819
target_include_directories(swiftDemangling
1920
PRIVATE

Runtimes/Core/LLVMSupport/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ add_library(swiftLLVMSupport OBJECT
55
SmallPtrSet.cpp
66
SmallVector.cpp
77
StringRef.cpp)
8+
target_compile_options(swiftLLVMSupport
9+
PRIVATE
10+
$<$<BOOL:${SwiftCore_HAS_ASL}>:-DSWIFT_STDLIB_HAS_ASL>)

Runtimes/Core/runtime/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ target_compile_definitions(swiftRuntime
8585
$<$<BOOL:${SwiftCore_BACKTRACER_PATH}>:-DSWIFT_RUNTIME_FIXED_BACKTRACER_PATH="${SwiftCore_BACKTRACER_PATH}">
8686
$<$<BOOL:${SwiftCore_ENABLE_STDLIB_TRACING}>:-DSWIFT_STDLIB_TRACING>
8787
$<$<BOOL:${SwiftCore_ENABLE_SHORT_MANGLING_LOOKUPS}>:-DSWIFT_STDLIB_SHORT_MANGLING_LOOKUPS>
88+
$<$<BOOL:${SwiftCore_HAS_ASL}>:-DSWIFT_STDLIB_HAS_ASL>
8889
$<$<BOOL:${SwiftCore_HAS_DLADDR}>:-DSWIFT_STDLIB_HAS_DLADDR>
8990
$<$<BOOL:${SwiftCore_HAS_DLSYM}>:-DSWIFT_STDLIB_HAS_DLSYM>)
9091

0 commit comments

Comments
 (0)