File tree Expand file tree Collapse file tree 2 files changed +10
-12
lines changed Expand file tree Collapse file tree 2 files changed +10
-12
lines changed Original file line number Diff line number Diff line change @@ -1900,12 +1900,11 @@ swift-include-tests=0
1900
1900
darwin-deployment-version-ios =10.0
1901
1901
darwin-crash-reporter-client =1
1902
1902
1903
- [preset: build_swiftsyntax_release ]
1903
+ [preset: install_swiftsyntax_parser ]
1904
1904
release
1905
1905
lto
1906
1906
no-assertions
1907
1907
build-libparser-only
1908
- swiftsyntax
1909
1908
verbose-build
1910
- skip-swiftsyntax-swiftside
1911
1909
darwin-install-extract-symbols
1910
+ install-swift
Original file line number Diff line number Diff line change @@ -3504,6 +3504,11 @@ for host in "${ALL_HOSTS[@]}"; do
3504
3504
if [[ -z " ${INSTALL_SWIFT} " ]] ; then
3505
3505
continue
3506
3506
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
3507
3512
;;
3508
3513
llbuild)
3509
3514
if [[ -z " ${INSTALL_LLBUILD} " ]] ; then
@@ -3810,15 +3815,9 @@ for host in "${ALL_HOSTS[@]}"; do
3810
3815
call darwin_install_extract_symbols
3811
3816
else
3812
3817
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} "
3822
3821
3823
3822
# Copy executables and shared libraries from the `host_install_destdir` to
3824
3823
# INSTALL_SYMROOT and run dsymutil on them.
You can’t perform that action at this time.
0 commit comments