Skip to content

build: separate out host build of SwiftRemoteMirror #28464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 2, 2019
Merged

build: separate out host build of SwiftRemoteMirror #28464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ add_subdirectory(Sema)
add_subdirectory(Serialization)
add_subdirectory(SwiftDemangle)
add_subdirectory(SwiftReflection)
add_subdirectory(SwiftRemoteMirror)
add_subdirectory(SIL)
add_subdirectory(SILGen)
add_subdirectory(SILOptimizer)
Expand Down
5 changes: 5 additions & 0 deletions lib/SwiftRemoteMirror/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
add_swift_host_library(swiftRemoteMirror STATIC
${SWIFT_SOURCE_DIR}/stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp)
if(CMAKE_SYSTEM_NAME STREQUAL Windows)
target_compile_definitions(swiftRemoteMirror PRIVATE _LIB)
endif()
28 changes: 0 additions & 28 deletions stdlib/public/SwiftRemoteMirror/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,3 @@ if(SWIFT_BUILD_DYNAMIC_STDLIB)
INSTALL_IN_COMPONENT
swift-remote-mirror)
endif()

# Build a specific version for the host with the host toolchain. This is going
# to be used by tools (e.g. lldb)
if(SWIFT_INCLUDE_TOOLS)
if(NOT SWIFT_BUILD_DYNAMIC_STDLIB)
add_custom_target(swiftRemoteMirror-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR})
endif()

if(NOT SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER)
set(CURRENT_CMAKE_C_COMPILER ${CMAKE_C_COMPILER})
set(CURRENT_CMAKE_CXX_COMPILER ${CMAKE_CXX_COMPILER})
set(CMAKE_C_COMPILER ${HOST_CMAKE_C_COMPILER})
set(CMAKE_CXX_COMPILER ${HOST_CMAKE_CXX_COMPILER})
endif()

add_swift_host_library(swiftRemoteMirror STATIC
SwiftRemoteMirror.cpp)
target_compile_definitions(swiftRemoteMirror PRIVATE _LIB)
target_compile_options(swiftRemoteMirror PRIVATE
${SWIFT_RUNTIME_CXX_FLAGS})
set_property(TARGET swiftRemoteMirror APPEND_STRING PROPERTY LINK_FLAGS
${SWIFT_RUNTIME_LINK_FLAGS})

if(NOT SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER)
set(CMAKE_C_COMPILER ${CURRENT_CMAKE_C_COMPILER})
set(CMAKE_CXX_COMPILER ${CURRENT_CMAKE_CXX_COMPILER})
endif()
endif()