Skip to content

Commit f24f354

Browse files
committed
[CMake] Force bootstrapping to host tools if the new parser is enabled
We cannot mix building the Swift libs with a host and new compiler. If the new parser is enabled, force to host tools. Resolves rdar://116686158.
1 parent 201a5d0 commit f24f354

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -872,6 +872,12 @@ if(SWIFT_BUILD_SWIFT_SYNTAX)
872872
message(WARNING "Force setting BOOTSTRAPPING=HOSTTOOLS because Swift parser integration is enabled")
873873
set(BOOTSTRAPPING_MODE "HOSTTOOLS")
874874
endif()
875+
876+
# We cannot mix the parser using host tools and SwiftCompilerSources uses bootstrapping
877+
if(BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")
878+
message(WARNING "Force setting BOOTSTRAPPING=HOSTTOOLS because Swift parser integration is enabled")
879+
set(BOOTSTRAPPING_MODE "HOSTTOOLS")
880+
endif()
875881
endif()
876882

877883
if(BOOTSTRAPPING_MODE MATCHES "HOSTTOOLS|.*-WITH-HOSTLIBS")

test/ASTGen/types.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
// -enable-experimental-feature requires an asserts build
44
// REQUIRES: asserts
5-
// rdar://116686158
6-
// UNSUPPORTED: asan
75

86
protocol P { }
97
protocol Q { }

test/ASTGen/verify-parse.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
// -enable-experimental-feature requires an asserts build
1212
// REQUIRES: asserts
13-
// rdar://116686158
14-
// UNSUPPORTED: asan
1513

1614
// NB: Ridiculous formatting to test that we do not include leading trivia in locations.
1715

0 commit comments

Comments
 (0)