File tree Expand file tree Collapse file tree 2 files changed +18
-1
lines changed Expand file tree Collapse file tree 2 files changed +18
-1
lines changed Original file line number Diff line number Diff line change 1
1
---
2
- refs/heads/master: 2d6266a631341d5c90de44bcb4c6776c78ba6b3b
2
+ refs/heads/master: 43d853e86640ed15fca3d6f772d50da147f546f8
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 @@ -27,10 +27,27 @@ config.variant_suffix = "@VARIANT_SUFFIX@"
27
27
config .variant_sdk = "@VARIANT_SDK@"
28
28
config .swift_test_results_dir = \
29
29
lit_config .params .get ("swift_test_results_dir" , "@SWIFT_TEST_RESULTS_DIR@" )
30
+
31
+ # --- Darwin Configuration ---
30
32
config .darwin_xcrun_toolchain = "@SWIFT_DARWIN_XCRUN_TOOLCHAIN@"
33
+
34
+ # --- Android Configuration ---
31
35
config .android_ndk_path = "@SWIFT_ANDROID_NDK_PATH@"
32
36
config .android_ndk_gcc_version = "@SWIFT_ANDROID_NDK_GCC_VERSION@"
33
37
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
+
34
51
config .coverage_mode = "@SWIFT_ANALYZE_CODE_COVERAGE@"
35
52
config .lldb_build_root = "@LLDB_BUILD_DIR@"
36
53
You can’t perform that action at this time.
0 commit comments