File tree Expand file tree Collapse file tree 2 files changed +2
-2
lines changed Expand file tree Collapse file tree 2 files changed +2
-2
lines changed Original file line number Diff line number Diff line change 1
1
---
2
- refs/heads/master: 0e124865de5f9222c2cfbaaabedd2513f37b6c87
2
+ refs/heads/master: 7ac90ed86033657421194b753aa2093dde96a89b
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 @@ -250,7 +250,7 @@ foreach(SDK ${SWIFT_SDKS})
250
250
set (LIT_ARGS "${SWIFT_TEST_EXTRA_ARGS} ${LLVM_LIT_ARGS} " )
251
251
separate_arguments (LIT_ARGS )
252
252
253
- if (NOT SWIFT_BUILD_STDLIB )
253
+ if (NOT SWIFT_BUILD_STDLIB AND NOT SWIFT_PATH_TO_EXTERNAL_STDLIB_BUILD )
254
254
list (APPEND LIT_ARGS
255
255
"--param" "test_sdk_overlay_dir=${SWIFTLIB_DIR} /${SWIFT_SDK_${SDK} _LIB_SUBDIR}" )
256
256
endif ()
You can’t perform that action at this time.
0 commit comments