Skip to content

Commit cfbe951

Browse files
committed
---
yaml --- r: 317423 b: refs/heads/master-rebranch c: a3412ad h: refs/heads/master i: 317421: ac7c93a 317419: 961608f 317415: 38fa11f 317407: 026acef
1 parent d721ca6 commit cfbe951

File tree

2 files changed

+16
-13
lines changed

2 files changed

+16
-13
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1457,4 +1457,4 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
14571457
refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
14581458
refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
14591459
refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
1460-
refs/heads/master-rebranch: 744c3a8d265b251606459f8fc1d238998b5f46d4
1460+
refs/heads/master-rebranch: a3412ad91540f3e53bfbdeb2a7c3de8d049557d3

branches/master-rebranch/stdlib/public/Reflection/CMakeLists.txt

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,25 @@ if(SWIFT_BUILD_STDLIB)
2525
C_COMPILE_FLAGS ${SWIFT_RUNTIME_CXX_FLAGS}
2626
LINK_FLAGS ${SWIFT_RUNTIME_LINK_FLAGS}
2727
INSTALL_IN_COMPONENT dev)
28-
else()
29-
add_custom_target(swiftReflection-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR})
3028
endif()
3129

3230
# Build a specific version for the host with the host toolchain. This is going
3331
# to be used by tools (e.g. lldb)
32+
if(SWIFT_INCLUDE_TOOLS)
33+
if(NOT SWIFT_BUILD_STDLIB)
34+
add_custom_target(swiftReflection-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR})
35+
endif()
3436

35-
if(NOT SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER)
36-
set(CMAKE_C_COMPILER ${HOST_CMAKE_C_COMPILER})
37-
set(CMAKE_CXX_COMPILER ${HOST_CMAKE_CXX_COMPILER})
38-
endif()
37+
if(NOT SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER)
38+
set(CMAKE_C_COMPILER ${HOST_CMAKE_C_COMPILER})
39+
set(CMAKE_CXX_COMPILER ${HOST_CMAKE_CXX_COMPILER})
40+
endif()
3941

40-
add_swift_host_library(swiftReflection STATIC
41-
${swiftReflection_SOURCES})
42-
target_compile_options(swiftReflection PRIVATE
43-
${SWIFT_RUNTIME_CXX_FLAGS})
44-
set_property(TARGET swiftReflection
45-
APPEND_STRING PROPERTY LINK_FLAGS ${SWIFT_RUNTIME_LINK_FLAGS})
42+
add_swift_host_library(swiftReflection STATIC
43+
${swiftReflection_SOURCES})
44+
target_compile_options(swiftReflection PRIVATE
45+
${SWIFT_RUNTIME_CXX_FLAGS})
46+
set_property(TARGET swiftReflection
47+
APPEND_STRING PROPERTY LINK_FLAGS ${SWIFT_RUNTIME_LINK_FLAGS})
48+
endif()
4649

0 commit comments

Comments
 (0)