Skip to content

Commit 76fb3c5

Browse files
authored
Merge pull request swiftlang#78430 from etcwilde/ewilde/stdlib-rebuild-dlsym-dladdr
CMake: Set SWIFT_STDLIB_HAS_DLADDR/DLSYM
2 parents 87d6979 + 84a1c12 commit 76fb3c5

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

Runtimes/Core/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ set(SwiftCore_VENDOR_MODULE_DIR "${SwiftCore_CMAKE_MODULES_DIR}/vendor"
6161
CACHE FILEPATH "Location for private build system extension")
6262

6363
include(GNUInstallDirs)
64+
include(CheckSymbolExists)
6465
include(AvailabilityMacros)
6566
include(CompilerSettings)
6667
include(DefaultSettings)
@@ -69,6 +70,9 @@ include(PlatformInfo)
6970
include(gyb)
7071
include(Plist)
7172

73+
check_symbol_exists("dladdr" "dlfcn.h" SwiftCore_HAS_DLADDR)
74+
check_symbol_exists("dlsym" "dlfcn.h" SwiftCore_HAS_DLSYM)
75+
7276
include("${SwiftCore_VENDOR_MODULE_DIR}/Settings.cmake" OPTIONAL)
7377

7478
defaulted_option(SwiftCore_ENABLE_LIBRARY_EVOLUTION "Generate ABI resilient runtime libraries")

Runtimes/Core/runtime/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ target_compile_definitions(swiftRuntime
8484
$<$<BOOL:${SwiftCore_ENABLE_MALLOC_TYPE}>:-DSWIFT_STDLIB_HAS_MALLOC_TYPE>
8585
$<$<BOOL:${SwiftCore_BACKTRACER_PATH}>:-DSWIFT_RUNTIME_FIXED_BACKTRACER_PATH="${SwiftCore_BACKTRACER_PATH}">
8686
$<$<BOOL:${SwiftCore_ENABLE_STDLIB_TRACING}>:-DSWIFT_STDLIB_TRACING>
87-
$<$<BOOL:${SwiftCore_ENABLE_SHORT_MANGLING_LOOKUPS}>:-DSWIFT_STDLIB_SHORT_MANGLING_LOOKUPS>)
87+
$<$<BOOL:${SwiftCore_ENABLE_SHORT_MANGLING_LOOKUPS}>:-DSWIFT_STDLIB_SHORT_MANGLING_LOOKUPS>
88+
$<$<BOOL:${SwiftCore_HAS_DLADDR}>:-DSWIFT_STDLIB_HAS_DLADDR>
89+
$<$<BOOL:${SwiftCore_HAS_DLSYM}>:-DSWIFT_STDLIB_HAS_DLSYM>)
8890

8991
target_include_directories(swiftRuntime PRIVATE
9092
"${PROJECT_BINARY_DIR}/include"

0 commit comments

Comments
 (0)