Skip to content

Commit aeec2eb

Browse files
authored
Merge pull request #59316 from apple/egorzhdan/hosttools-require-recent-swift
[SwiftCompilerSources] Require very recent Swift compiler in `HOSTTOOLS` mode
2 parents 4dffe27 + a8ae273 commit aeec2eb

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

SwiftCompilerSources/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ else()
229229
message(FATAL_ERROR "The Swift compiler (${CMAKE_Swift_COMPILER}) differs from the Swift compiler in SWIFT_NATIVE_SWIFT_TOOLS_PATH (${SWIFT_NATIVE_SWIFT_TOOLS_PATH}/swiftc).")
230230
endif()
231231

232-
set(min_supported_swift_version 5.5)
232+
set(min_supported_swift_version 5.8)
233233
if(CMAKE_Swift_COMPILER_VERSION VERSION_LESS "${min_supported_swift_version}")
234234
message(FATAL_ERROR
235235
"Outdated Swift compiler: building with host tools requires Swift ${min_supported_swift_version} or newer. "

utils/build-presets.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ enable-asan
594594
swift-stdlib-build-type=RelWithDebInfo
595595

596596
# Don't do bootstrapping to speed up the build
597-
bootstrapping=hosttools
597+
# TODO: use bootstrapping=hosttools
598598

599599

600600
[preset: buildbot_incremental,tools=RA,stdlib=RD,smoketest=macosx]
@@ -1404,7 +1404,7 @@ debug-swift
14041404
no-swift-stdlib-assertions
14051405

14061406
# Don't do bootstrapping to speed up the build
1407-
bootstrapping=hosttools
1407+
# TODO: use bootstrapping=hosttools
14081408

14091409

14101410
[preset: buildbot_osx_package,tools=DA,stdlib=R,use_os_runtime]
@@ -2275,7 +2275,7 @@ debug-llvm
22752275
debug-swift
22762276

22772277
# Don't do bootstrapping to speed up the build
2278-
bootstrapping=hosttools
2278+
# TODO: use bootstrapping=hosttools
22792279

22802280

22812281
#===------------------------------------------------------------------------===#
@@ -2296,7 +2296,7 @@ swift-stdlib-build-type=RelWithDebInfo
22962296
swift-stdlib-enable-assertions=true
22972297

22982298
# Don't do bootstrapping to speed up the build
2299-
bootstrapping=hosttools
2299+
# TODO: use bootstrapping=hosttools
23002300

23012301

23022302
#===------------------------------------------------------------------------===#

0 commit comments

Comments
 (0)