Skip to content

Commit 59a9ef5

Browse files
authored
Merge pull request #78134 from etcwilde/ewilde/x-platform-fixes
[CMake] Fix some issues in new runtime build for Linux and Windows builds
2 parents 7b8c339 + 78914e9 commit 59a9ef5

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Runtimes/Core/cmake/modules/DefaultSettings.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ endmacro()
2828
# If no such default variable exists, the variable is not created.
2929
macro(defaulted_set variable type helptext)
3030
if(DEFINED ${variable}_default)
31-
set(${variable} ${variable}_default CACHE ${type} ${helptext})
31+
set(${variable} ${${variable}_default} CACHE ${type} ${helptext})
3232
endif()
3333
endmacro()
3434

Runtimes/Core/runtime/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,12 @@ if(SwiftCore_ENABLE_BACKTRACING)
109109
CrashHandlerLinux.cpp)
110110
endif()
111111

112+
target_sources(swiftRuntime PRIVATE
113+
ErrorObject.mm
114+
SwiftObject.mm)
115+
112116
if(SwiftCore_ENABLE_OBJC_INTEROP)
113117
target_sources(swiftRuntime PRIVATE
114-
ErrorObject.mm
115-
SwiftObject.mm
116118
SwiftValue.mm
117119
ReflectionMirrorObjC.mm
118120
ObjCRuntimeGetImageNameFromClass.mm)

0 commit comments

Comments
 (0)