File tree Expand file tree Collapse file tree 2 files changed +3
-4
lines changed
trunk/tools/SourceKit/tools/swift-lang Expand file tree Collapse file tree 2 files changed +3
-4
lines changed Original file line number Diff line number Diff line change 1
1
---
2
- refs/heads/master: 3bf55b62eb37822597dd1e70712d97819ed62b9c
2
+ refs/heads/master: 3c042b9edec3ec56cce1d9632eeafb628b59d057
3
3
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
4
4
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
5
5
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
Original file line number Diff line number Diff line change 1
- if (NOT SWIFT_SOURCEKIT_USE_INPROC_LIBRARY )
1
+ if (NOT SWIFT_SOURCEKIT_USE_INPROC_LIBRARY AND SWIFT_BUILD_STDLIB )
2
2
set (EXTRA_COMPILE_FLAGS "-F" "${SWIFT_LIBRARY_OUTPUT_INTDIR} " )
3
3
set (SOURCEKITD_LINK_LIBS sourcekitd )
4
4
set (INSTALLED_COMP sourcekit-xpc-service )
@@ -13,10 +13,9 @@ if(NOT SWIFT_SOURCEKIT_USE_INPROC_LIBRARY)
13
13
UIDs.swift.gyb
14
14
15
15
DEPENDS ${DEPENDS_LIST}
16
- SWIFT_MODULE_DEPENDS_OSX Darwin
17
16
PRIVATE_LINK_LIBRARIES ${SOURCEKITD_LINK_LIBS}
18
17
SWIFT_COMPILE_FLAGS ${EXTRA_COMPILE_FLAGS}
19
18
INSTALL_IN_COMPONENT ${INSTALLED_COMP}
20
19
TARGET_SDKS ${SOURCEKIT_DEFAULT_TARGET_SDK}
21
20
IS_STDLIB )
22
- endif ()
21
+ endif ()
You can’t perform that action at this time.
0 commit comments