Skip to content

Commit 0645642

Browse files
committed
[CMake] Force bootstrapping to HOSTTOOLS 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 aaf2f7e commit 0645642

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -895,11 +895,13 @@ elseif(BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS" OR SWIFT_BUILD_SWIFT_SYNTAX)
895895
endif()
896896

897897
if(SWIFT_INCLUDE_TOOLS AND SWIFT_BUILD_SWIFT_SYNTAX)
898-
# Only "HOSTTOOLS" is supported in Linux when Swift parser integration is enabled.
899-
if(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|OPENBSD|FREEBSD" AND NOT BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS")
898+
# HOSTTOOLS is the only supported configuration when Swift parser integration
899+
# is enabled.
900+
if(NOT BOOTSTRAPPING_MODE STREQUAL "OFF" AND NOT BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS")
900901
message(WARNING "Force setting BOOTSTRAPPING=HOSTTOOLS because Swift parser integration is enabled")
901902
set(BOOTSTRAPPING_MODE "HOSTTOOLS")
902903
endif()
904+
903905
add_definitions(-DSWIFT_BUILD_SWIFT_SYNTAX)
904906
endif()
905907

test/ASTGen/decls.swift

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

1717
// -enable-experimental-feature requires an asserts build
1818
// REQUIRES: asserts
19-
// rdar://116686158
20-
// UNSUPPORTED: asan
2119

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

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 { }

0 commit comments

Comments
 (0)