Skip to content

Commit 7944635

Browse files
authored
Merge pull request #61898 from CodaFi/i-write-syns-not-tragedies
2 parents 2a8b2ce + 3a73bef commit 7944635

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+44
-1759
lines changed

.flake8

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ filename =
1616

1717
./utils/80+-check,
1818
./utils/backtrace-check,
19-
./utils/build-parser-lib,
2019
./utils/build-script,
2120
./utils/check-incremental,
2221
./utils/coverage/coverage-build-db,

CMakeLists.txt

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -572,13 +572,6 @@ option(SWIFT_ENABLE_GLOBAL_ISEL_ARM64
572572
"Enable global isel on arm64"
573573
FALSE)
574574

575-
cmake_dependent_option(SWIFT_BUILD_SYNTAXPARSERLIB
576-
"Build the Swift Syntax Parser library" TRUE
577-
"SWIFT_ENABLE_DISPATCH" FALSE)
578-
cmake_dependent_option(SWIFT_BUILD_ONLY_SYNTAXPARSERLIB
579-
"Only build the Swift Syntax Parser library" FALSE
580-
"SWIFT_BUILD_SYNTAXPARSERLIB" FALSE)
581-
582575
cmake_dependent_option(SWIFT_BUILD_SOURCEKIT
583576
"Build SourceKit" TRUE
584577
"SWIFT_ENABLE_DISPATCH" FALSE)
@@ -637,13 +630,13 @@ set(SWIFT_BUILD_HOST_DISPATCH FALSE)
637630
if(SWIFT_ENABLE_DISPATCH AND NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
638631
# Only build libdispatch for the host if the host tools are being built and
639632
# specifically if these two libraries that depend on it are built.
640-
if(SWIFT_INCLUDE_TOOLS AND (SWIFT_BUILD_SYNTAXPARSERLIB OR SWIFT_BUILD_SOURCEKIT))
633+
if(SWIFT_INCLUDE_TOOLS AND SWIFT_BUILD_SOURCEKIT)
641634
set(SWIFT_BUILD_HOST_DISPATCH TRUE)
642635
endif()
643636

644637
if(SWIFT_BUILD_HOST_DISPATCH OR SWIFT_CONCURRENCY_USES_DISPATCH)
645638
if(NOT EXISTS "${SWIFT_PATH_TO_LIBDISPATCH_SOURCE}")
646-
message(SEND_ERROR "SyntaxParserLib, SourceKit, and concurrency require libdispatch on non-Darwin hosts. Please specify SWIFT_PATH_TO_LIBDISPATCH_SOURCE")
639+
message(SEND_ERROR "SourceKit and concurrency require libdispatch on non-Darwin hosts. Please specify SWIFT_PATH_TO_LIBDISPATCH_SOURCE")
647640
endif()
648641
endif()
649642
endif()

cmake/caches/Linux-x86_64.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ set(SWIFT_INSTALL_COMPONENTS
148148
sourcekit-inproc
149149
swift-remote-mirror
150150
swift-remote-mirror-headers
151-
parser-lib
152151
CACHE STRING "")
153152

154153
set(LLVM_DISTRIBUTION_COMPONENTS

cmake/caches/Runtime-Android-aarch64.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ set(SWIFT_INCLUDE_TESTS NO CACHE BOOL "")
1313
set(SWIFT_INCLUDE_DOCS NO CACHE BOOL "")
1414

1515
# NOTE(compnerd) these are part of the toolchain, not the runtime.
16-
set(SWIFT_BUILD_SYNTAXPARSERLIB NO CACHE BOOL "")
1716
set(SWIFT_BUILD_SOURCEKIT NO CACHE BOOL "")
1817

1918
# NOTE(compnerd) build with the compiler specified, not a just built compiler.

cmake/caches/Runtime-Android-armv7.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ set(SWIFT_INCLUDE_TESTS NO CACHE BOOL "")
1313
set(SWIFT_INCLUDE_DOCS NO CACHE BOOL "")
1414

1515
# NOTE(compnerd) these are part of the toolchain, not the runtime.
16-
set(SWIFT_BUILD_SYNTAXPARSERLIB NO CACHE BOOL "")
1716
set(SWIFT_BUILD_SOURCEKIT NO CACHE BOOL "")
1817

1918
# NOTE(compnerd) build with the compiler specified, not a just built compiler.

cmake/caches/Runtime-Linux-x86_64.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ set(SWIFT_INCLUDE_TESTS NO CACHE BOOL "")
1313
set(SWIFT_INCLUDE_DOCS NO CACHE BOOL "")
1414

1515
# NOTE(compnerd) these are part of the toolchain, not the runtime.
16-
set(SWIFT_BUILD_SYNTAXPARSERLIB NO CACHE BOOL "")
1716
set(SWIFT_BUILD_SOURCEKIT NO CACHE BOOL "")
1817

1918
# NOTE(compnerd) build with the compiler specified, not a just built compiler.

cmake/caches/Runtime-WASI-wasm32.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ set(SWIFT_INCLUDE_TOOLS NO CACHE BOOL "")
99
set(SWIFT_INCLUDE_TESTS TRUE CACHE BOOL "")
1010
set(SWIFT_INCLUDE_DOCS NO CACHE BOOL "")
1111

12-
set(SWIFT_BUILD_SYNTAXPARSERLIB NO CACHE BOOL "")
1312
set(SWIFT_BUILD_SOURCEKIT NO CACHE BOOL "")
1413
set(SWIFT_ENABLE_SOURCEKIT_TESTS NO CACHE BOOL "")
1514

cmake/caches/Runtime-Windows-aarch64.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ set(SWIFT_INCLUDE_TESTS NO CACHE BOOL "")
1313
set(SWIFT_INCLUDE_DOCS NO CACHE BOOL "")
1414

1515
# NOTE(compnerd) these are part of the toolchain, not the runtime.
16-
set(SWIFT_BUILD_SYNTAXPARSERLIB NO CACHE BOOL "")
1716
set(SWIFT_BUILD_SOURCEKIT NO CACHE BOOL "")
1817

1918
# NOTE(compnerd) build with the compiler specified, not a just built compiler.

cmake/caches/Runtime-Windows-i686.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ set(SWIFT_INCLUDE_TESTS NO CACHE BOOL "")
1313
set(SWIFT_INCLUDE_DOCS NO CACHE BOOL "")
1414

1515
# NOTE(compnerd) these are part of the toolchain, not the runtime.
16-
set(SWIFT_BUILD_SYNTAXPARSERLIB NO CACHE BOOL "")
1716
set(SWIFT_BUILD_SOURCEKIT NO CACHE BOOL "")
1817

1918
# NOTE(compnerd) build with the compiler specified, not a just built compiler.

cmake/caches/Runtime-Windows-x86_64.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ set(SWIFT_INCLUDE_TESTS NO CACHE BOOL "")
1313
set(SWIFT_INCLUDE_DOCS NO CACHE BOOL "")
1414

1515
# NOTE(compnerd) these are part of the toolchain, not the runtime.
16-
set(SWIFT_BUILD_SYNTAXPARSERLIB NO CACHE BOOL "")
1716
set(SWIFT_BUILD_SOURCEKIT NO CACHE BOOL "")
1817

1918
# NOTE(compnerd) build with the compiler specified, not a just built compiler.

0 commit comments

Comments
 (0)