Skip to content

[release] Copy Dispatch and Clang from upstream toolchain #921

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.

Sign up for GitHub

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 4 commits into from
May 10, 2020
Merged

[release] Copy Dispatch and Clang from upstream toolchain #921

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fdcab87
Copy Dispatch and Clang from upstream toolchain
MaxDesiatov Apr 19, 2020
cf9569b
Use rsync to copy /usr/lib
MaxDesiatov May 7, 2020
3026a61
Remove redundant whitespace in build-toolchain.sh
MaxDesiatov May 7, 2020
38228d1
Create clang directory manually in build-toolchain.sh
MaxDesiatov May 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions utils/webassembly/build-toolchain.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,15 @@ BUNDLE_IDENTIFIER="swiftwasm.5.3-${YEAR}${MONTH}${DAY}"
DISPLAY_NAME_SHORT="Swift for WebAssembly 5.3 Snapshot"
DISPLAY_NAME="${DISPLAY_NAME_SHORT} ${YEAR}-${MONTH}-${DAY}"

# Just a hack, spent enough time investigating this,
# but somehow `master` is able to work without this `mkdir`.
mkdir -p $SOURCE_PATH/install/$TOOLCHAIN_NAME/usr/lib/clang/10.0.0
$BUILD_SCRIPT \
--install_destdir="$SOURCE_PATH/install" \
--installable_package="$INSTALLABLE_PACKAGE" \
--install-prefix=/$TOOLCHAIN_NAME/usr \
--swift-install-components "autolink-driver;compiler;clang-builtin-headers;stdlib;sdk-overlay;parser-lib;editor-integration;tools;testsuite-tools;toolchain-tools;license;sourcekit-inproc;swift-remote-mirror;swift-remote-mirror-headers;clang-resource-dir-symlink" \
--llvm-install-components "clang" \
--install-swift \
--darwin-toolchain-bundle-identifier="${BUNDLE_IDENTIFIER}" \
--darwin-toolchain-display-name="${DISPLAY_NAME}" \
Expand All @@ -61,7 +66,7 @@ cd $TMP_DIR/$TOOLCHAIN_NAME

# Merge wasi-sdk and toolchain
cp -r $WASI_SDK_PATH/lib/clang usr/lib
cp $WASI_SDK_PATH/bin/* usr/bin
cp -a $WASI_SDK_PATH/bin/*ld usr/bin
cp -r $WASI_SDK_PATH/share/wasi-sysroot usr/share

# Build SwiftPM and install it into toolchain
Expand All @@ -73,7 +78,9 @@ sed -i -e "s@\".*/include@\"../../../../share/wasi-sysroot/include@g" $TMP_DIR/$
# Copy nightly-toolchain's host environment stdlib into toolchain

if [[ "$(uname)" == "Linux" ]]; then
cp -r $NIGHTLY_TOOLCHAIN/usr/lib/swift/linux $TMP_DIR/$TOOLCHAIN_NAME/usr/lib/swift
# Avoid to copy usr/lib/swift/clang because our toolchain's one is a directory
# but nightly's one is symbolic link, so fail to merge them.
rsync -a $NIGHTLY_TOOLCHAIN/usr/lib/ $TMP_DIR/$TOOLCHAIN_NAME/usr/lib/ --exclude 'swift/clang'
else
cp -r $NIGHTLY_TOOLCHAIN/usr/lib/swift/macosx $TMP_DIR/$TOOLCHAIN_NAME/usr/lib/swift
fi
Expand Down