Copy Dispatch and Clang from upstream toolchain #719
Conversation
MaxDesiatov
changed the title
MaxDesiatov
changed the title
MaxDesiatov
requested review from
kateinoigakukun
and removed request for
kateinoigakukun
MaxDesiatov
changed the title
MaxDesiatov
force-pushed
the
maxd/upstream-dispatch
branch
from
e25675b
to
224d460
Compare
MaxDesiatov
changed the title
MaxDesiatov
force-pushed
the
maxd/upstream-dispatch
branch
from
224d460
to
dad8e1f
Compare
MaxDesiatov
force-pushed
the
maxd/upstream-dispatch
branch
from
ce7d4bc
to
65e696d
Compare
|
It finally works! 🎉 I've got the last artifact package in the |
utils/webassembly/build-toolchain.sh
Outdated
| @@ -73,7 +74,7 @@ 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 | |||
| cp -a $NIGHTLY_TOOLCHAIN/usr/lib/* $TMP_DIR/$TOOLCHAIN_NAME/usr/lib || true | |||
There was a problem hiding this comment.
I'm not sure why need || true 🤔 Could you explain more?
There was a problem hiding this comment.
There's a single file that fails to get copied, related to clang I think. It doesn't cause problems as far as I understand, and it's a pain to test and to exclude just a single file. I can add a comment about that in the script. Not sure I'll be able to get the exact file name quickly, seems like GitHub erased logs for the previous actions in this PR (maybe because of the force push?), and I don't have access to powerful hardware to re-run builds quickly from scratch.
There was a problem hiding this comment.
OK, I'll try it on my local linux machine 👍
There was a problem hiding this comment.
I got the error. It seems that our toolchain's lib/swift/clang is a directory but nightly toolchain's one is a symlink.
cp: cannot overwrite directory '/tmp/tmp.wtHPlnPXwh/swift-wasm-DEVELOPMENT-SNAPSHOT-2020-05-06-a/usr/lib/swift/clang' with non-directory
So I added clang-resource-dir-symlink component to install to create that symlink
|
@MaxDesiatov Could you check the latest toolchain with my commit work well on the docker image? |
|
Will do, thanks for the updates! |
Resolve #713. This should copy modulemaps and headers and shouldn't overwrite any wasm libraries.
clangbinaries are now longer copied from the upstream snapshot instead ofwasi-sdk, as the latter can't builf for host architectures (at least on Linux).