File tree Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -18,6 +18,7 @@ import platform
18
18
import sys
19
19
import time
20
20
21
+ from build_swift import defaults
21
22
from build_swift import driver_arguments
22
23
23
24
from swift_build_support .swift_build_support import (
@@ -1041,10 +1042,12 @@ def main_normal():
1041
1042
shell .dry_run = args .dry_run
1042
1043
1043
1044
# Prepare and validate toolchain
1044
- env_toolchain = os .environ .get ('TOOLCHAINS' )
1045
1045
if args .darwin_xcrun_toolchain is None :
1046
- diagnostics .note ('using toolchain {}' .format (env_toolchain ))
1047
- args .darwin_xcrun_toolchain = env_toolchain
1046
+ xcrun_toolchain = os .environ .get ('TOOLCHAINS' ,
1047
+ defaults .DARWIN_XCRUN_TOOLCHAIN )
1048
+
1049
+ diagnostics .note ('Using toolchain {}' .format (xcrun_toolchain ))
1050
+ args .darwin_xcrun_toolchain = xcrun_toolchain
1048
1051
1049
1052
toolchain = host_toolchain (xcrun_toolchain = args .darwin_xcrun_toolchain )
1050
1053
os .environ ['TOOLCHAINS' ] = args .darwin_xcrun_toolchain
You can’t perform that action at this time.
0 commit comments