File tree Expand file tree Collapse file tree 3 files changed +6
-1
lines changed Expand file tree Collapse file tree 3 files changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -103,6 +103,7 @@ option(SwiftCore_ENABLE_FILESYSTEM_SUPPORT "Build for systems that have a filesy
103
103
104
104
defaulted_option (SwiftCore_ENABLE_BACKTRACING "Enable backtracing runtime support" )
105
105
defaulted_set (SwiftCore_BACKTRACER_PATH STRING "Set a fixed path to the Swift backtracer" )
106
+ defaulted_option (SwiftCore_ENABLE_FATALERROR_BACKTRACE "Build stdlib fatalError with backtrace output" )
106
107
107
108
option (SwiftCore_ENABLE_CLOBBER_FREED_OBJECTS "" OFF )
108
109
option (SwiftCore_ENABLE_RUNTIME_LEAK_CHECKER "" OFF )
Original file line number Diff line number Diff line change @@ -37,6 +37,7 @@ if(APPLE)
37
37
set (SwiftCore_ENABLE_CRASH_REPORTER_CLIENT_default ON )
38
38
set (SwiftCore_ENABLE_OBJC_INTEROP_default ON )
39
39
set (SwiftCore_ENABLE_REFLECTION_default ON )
40
+ set (SwiftCore_ENABLE_FATALERROR_BACKTRACE_default ON )
40
41
set (SwiftCore_ENABLE_RUNTIME_OS_VERSIONING ON )
41
42
set (SwiftCore_ENABLE_OVERRIDABLE_RETAIN_RELEASE ON )
42
43
set (SwiftCore_THREADING_PACKAGE "DARWIN" )
@@ -45,6 +46,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "WASM")
45
46
set (SwiftCore_THREADING_PACKAGE "NONE" )
46
47
elseif (LINUX OR ANDROID OR BSD )
47
48
set (SwiftCore_OBJECT_FORMAT_default "elf" )
49
+ set (SwiftCore_ENABLE_FATALERROR_BACKTRACE_default ON )
48
50
if (LINUX )
49
51
set (SwiftCore_THREADING_PACKAGE "LINUX" )
50
52
else ()
@@ -53,6 +55,7 @@ elseif(LINUX OR ANDROID OR BSD)
53
55
elseif (WIN32 )
54
56
set (SwiftCore_OBJECT_FORMAT_default "coff" )
55
57
set (SwiftCore_THREADING_PACKAGE "WIN32" )
58
+ set (SwiftCore_ENABLE_FATALERROR_BACKTRACE_default ON )
56
59
endif ()
57
60
58
61
include ("${SwiftCore_VENDOR_MODULE_DIR} /DefaultSettings.cmake" OPTIONAL )
Original file line number Diff line number Diff line change @@ -100,7 +100,8 @@ target_compile_definitions(swiftRuntime
100
100
$< $< BOOL:${SwiftCore_HAS_DLSYM} > :-DSWIFT_STDLIB_HAS_DLSYM>
101
101
$< $< BOOL:${SwiftCore_ENABLE_FILESYSTEM_SUPPORT} > :-DSWIFT_STDLIB_HAS_FILESYSTEM>
102
102
$< $< BOOL:${SwiftCore_ENABLE_FILESYSTEM_SUPPORT} > :-DSWIFT_ARCH="${SwiftCore_ARCH_SUBDIR} ">
103
- $< $< BOOL:${SwiftCore_ENABLE_FILESYSTEM_SUPPORT} > :-DSWIFT_LIB_SUBDIR="${SwiftCore_PLATFORM_SUBDIR} "> )
103
+ $< $< BOOL:${SwiftCore_ENABLE_FILESYSTEM_SUPPORT} > :-DSWIFT_LIB_SUBDIR="${SwiftCore_PLATFORM_SUBDIR} ">
104
+ $< $< BOOL:${SwiftCore_ENABLE_FATALERROR_BACKTRACE} > :-DSWIFT_STDLIB_SUPPORTS_BACKTRACE_REPORTING> )
104
105
105
106
target_include_directories (swiftRuntime PRIVATE
106
107
"${PROJECT_BINARY_DIR} /include"
You can’t perform that action at this time.
0 commit comments