Skip to content

Commit c0cd063

Browse files
committed
---
yaml --- r: 347991 b: refs/heads/master c: 43d853e h: refs/heads/master i: 347989: 220e715 347987: 024ff7c 347983: f468377
1 parent 8dab1b9 commit c0cd063

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 2d6266a631341d5c90de44bcb4c6776c78ba6b3b
2+
refs/heads/master: 43d853e86640ed15fca3d6f772d50da147f546f8
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/validation-test/lit.site.cfg.in

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,27 @@ config.variant_suffix = "@VARIANT_SUFFIX@"
2727
config.variant_sdk = "@VARIANT_SDK@"
2828
config.swift_test_results_dir = \
2929
lit_config.params.get("swift_test_results_dir", "@SWIFT_TEST_RESULTS_DIR@")
30+
31+
# --- Darwin Configuration ---
3032
config.darwin_xcrun_toolchain = "@SWIFT_DARWIN_XCRUN_TOOLCHAIN@"
33+
34+
# --- Android Configuration ---
3135
config.android_ndk_path = "@SWIFT_ANDROID_NDK_PATH@"
3236
config.android_ndk_gcc_version = "@SWIFT_ANDROID_NDK_GCC_VERSION@"
3337

38+
# --- Windows MSVC Configuration ---
39+
config.swift_stdlib_msvc_runtime = None
40+
if "@SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY@" == "MultiThreaded":
41+
config.swift_stdlib_msvc_runtime = 'MT'
42+
elif "@SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY@" == "MultiThreadedDebug":
43+
config.swift_stdlib_msvc_runtime = 'MTd'
44+
elif "@SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY@" == "MultiThreadedDLL":
45+
config.swift_stdlib_msvc_runtime = 'MD'
46+
elif "@SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY@" == "MultiThreadedDebugDLL":
47+
config.swift_stdlib_msvc_runtime = 'MDd'
48+
else:
49+
assert(False)
50+
3451
config.coverage_mode = "@SWIFT_ANALYZE_CODE_COVERAGE@"
3552
config.lldb_build_root = "@LLDB_BUILD_DIR@"
3653

0 commit comments

Comments
 (0)