Skip to content

Commit 930ea50

Browse files
authored
Merge pull request swiftlang#22566 from nkcsgexi/tool-chain-install-syntax
build-script: install swiftsyntax parser into the toolchain
2 parents 3fb93cd + 15074fb commit 930ea50

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

utils/build-presets.ini

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1900,12 +1900,11 @@ swift-include-tests=0
19001900
darwin-deployment-version-ios=10.0
19011901
darwin-crash-reporter-client=1
19021902

1903-
[preset: build_swiftsyntax_release]
1903+
[preset: install_swiftsyntax_parser]
19041904
release
19051905
lto
19061906
no-assertions
19071907
build-libparser-only
1908-
swiftsyntax
19091908
verbose-build
1910-
skip-swiftsyntax-swiftside
19111909
darwin-install-extract-symbols
1910+
install-swift

utils/build-script-impl

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3504,6 +3504,11 @@ for host in "${ALL_HOSTS[@]}"; do
35043504
if [[ -z "${INSTALL_SWIFT}" ]] ; then
35053505
continue
35063506
fi
3507+
# Swift syntax parser is currently a sub-product of Swift;
3508+
# We need to specify the install target separately here.
3509+
if [ "${BUILD_LIBPARSER_ONLY}" ]; then
3510+
INSTALL_TARGETS=tools/libSwiftSyntaxParser/install
3511+
fi
35073512
;;
35083513
llbuild)
35093514
if [[ -z "${INSTALL_LLBUILD}" ]] ; then
@@ -3810,15 +3815,9 @@ for host in "${ALL_HOSTS[@]}"; do
38103815
call darwin_install_extract_symbols
38113816
else
38123817
set -x
3813-
if [ "${BUILD_LIBPARSER_ONLY}" ]; then
3814-
# We don't have a toolchain so we should install to the specified dir
3815-
CURRENT_INSTALL_DIR="${INSTALL_DESTDIR}"
3816-
CURRENT_PREFIX="/."
3817-
else
3818-
# If we have a toolchain, use the toolchain install dir.
3819-
CURRENT_INSTALL_DIR=${host_install_destdir}
3820-
CURRENT_PREFIX="${TOOLCHAIN_PREFIX}"
3821-
fi
3818+
3819+
CURRENT_INSTALL_DIR=${host_install_destdir}
3820+
CURRENT_PREFIX="${TOOLCHAIN_PREFIX}"
38223821

38233822
# Copy executables and shared libraries from the `host_install_destdir` to
38243823
# INSTALL_SYMROOT and run dsymutil on them.

0 commit comments

Comments
 (0)