Skip to content

[build-script] Pass updated arguments to SwiftSyntax's build script #27566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 8, 2019

Conversation

ahoppen
Copy link
Member

@ahoppen ahoppen commented Oct 7, 2019

Update the parameters passed to SwiftSyntax's build script to fix an issue that caused SwiftSyntax's module to not be properly installed.

Corresponds to swiftlang/swift-syntax#151

@ahoppen ahoppen requested a review from nkcsgexi October 7, 2019 22:21
@ahoppen
Copy link
Member Author

ahoppen commented Oct 7, 2019

swiftlang/swift-syntax#151

@swift-ci Please test

@@ -3443,7 +3443,7 @@ for host in "${ALL_HOSTS[@]}"; do
if [ "${BUILD_LIBPARSER_ONLY}" ]; then
# We don't have a toolchain so we should install to the specified dir
DYLIB_DIR="${INSTALL_DESTDIR}"
MODULE_DIR="${INSTALL_DESTDIR}"
MODULE_DIR="${INSTALL_DESTDIR}/SwiftSyntax.swiftmodule/${SWIFT_HOST_VARIANT_ARCH}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use ${product} for SwiftSyntax here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea. Changed it.

@swift-ci
Copy link
Contributor

swift-ci commented Oct 7, 2019

Build failed
Swift Test Linux Platform
Git Sha - 2cf40f20064f7bd7c8568a350cb6061a8a0c8a35

This fixes an issue that caused SwiftSyntax's module to not be properly
installed.
@ahoppen ahoppen force-pushed the install-swiftsyntax-module branch from 2cf40f2 to c4814cb Compare October 7, 2019 23:54
@ahoppen
Copy link
Member Author

ahoppen commented Oct 7, 2019

swiftlang/swift-syntax#151

@swift-ci Please test

@swift-ci
Copy link
Contributor

swift-ci commented Oct 7, 2019

Build failed
Swift Test OS X Platform
Git Sha - 2cf40f20064f7bd7c8568a350cb6061a8a0c8a35

@swift-ci
Copy link
Contributor

swift-ci commented Oct 7, 2019

Build failed
Swift Test Linux Platform
Git Sha - 2cf40f20064f7bd7c8568a350cb6061a8a0c8a35

@ahoppen ahoppen merged commit f2229c4 into swiftlang:master Oct 8, 2019
@ahoppen ahoppen deleted the install-swiftsyntax-module branch October 8, 2019 18:26
@gottesmm
Copy link
Contributor

@ahoppen question. Can you try using the build-script toolchain approach? Rather than using build-script-impl?

@gottesmm
Copy link
Contributor

nm, I see you are actually doing that! Big +1 from me!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants