{aarch64,x86_64}-*-windows-gnullvm: build host tools #140772
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| FROM ubuntu:22.04 | ||
|
|
||
| WORKDIR /build | ||
|
|
||
| ARG DEBIAN_FRONTEND=noninteractive | ||
| RUN apt-get update && apt-get install -y --no-install-recommends \ | ||
| ca-certificates \ | ||
| cmake \ | ||
| curl \ | ||
| g++ \ | ||
| git \ | ||
| make \ | ||
| ninja-build \ | ||
| python3 \ | ||
| xz-utils | ||
|
|
||
| COPY host-x86_64/dist-aarch64-windows-gnullvm/install-llvm-mingw.sh /build | ||
| RUN ./install-llvm-mingw.sh | ||
|
|
||
| COPY scripts/sccache.sh /scripts/ | ||
| RUN sh /scripts/sccache.sh | ||
|
|
||
| ENV CC_aarch64_pc_windows_gnullvm=aarch64-w64-mingw32-clang \ | ||
| CXX_aarch64_pc_windows_gnullvm=aarch64-w64-mingw32-clang++ | ||
|
|
||
| ENV HOST=aarch64-pc-windows-gnullvm | ||
|
|
||
| # We are bootstrapping this target and cannot use previously built artifacts. | ||
| # Without this option Clang is given `"-I/checkout/obj/build/aarch64-pc-windows-gnullvm/ci-llvm/include"` | ||
| # despite no such directory existing: | ||
| # ❯ ls obj/dist-windows-gnullvm/build/aarch64-pc-windows-gnullvm/ -1 | ||
| # llvm | ||
| # stage2 | ||
|
|
||
| ENV NO_DOWNLOAD_CI_LLVM 1 | ||
|
|
||
| ENV RUST_CONFIGURE_ARGS \ | ||
| --enable-extended \ | ||
| --enable-profiler \ | ||
| --enable-sanitizers \ | ||
| --disable-docs \ | ||
| --set llvm.download-ci-llvm=false \ | ||
| --set rust.llvm-tools=false | ||
| # LLVM cross tools are not installed into expected location so copying fails. | ||
| # Probably will solve itself when building from Windows. | ||
|
There was a problem hiding this comment. same question asked before. Why don't we build from windows now? Is it for the time required to change this PR and we want to ship this earlier? 🤔 |
||
| # --enable-full-tools \ | ||
|
|
||
| ENV SCRIPT python3 ../x.py dist --host $HOST --target $HOST | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| set -ex | ||
|
|
||
| release_date=20250430 | ||
| archive=llvm-mingw-${release_date}-ucrt-ubuntu-22.04-x86_64.tar.xz | ||
| curl -L https://github.com/mstorsjo/llvm-mingw/releases/download/${release_date}/${archive} | \ | ||
| tar --extract --xz --strip 1 --directory /usr/local | ||
|
|
||
| # https://github.com/mstorsjo/llvm-mingw/issues/493 | ||
| ln -s aarch64-w64-windows-gnu.cfg /usr/local/bin/aarch64-pc-windows-gnu.cfg |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| FROM ubuntu:22.04 | ||
|
|
||
| WORKDIR /build | ||
|
|
||
| ARG DEBIAN_FRONTEND=noninteractive | ||
| RUN apt-get update && apt-get install -y --no-install-recommends \ | ||
| ca-certificates \ | ||
| cmake \ | ||
| curl \ | ||
| g++ \ | ||
| git \ | ||
| make \ | ||
| ninja-build \ | ||
| python3 \ | ||
| xz-utils | ||
|
|
||
| COPY host-x86_64/dist-x86_64-windows-gnullvm/install-llvm-mingw.sh /build | ||
| RUN ./install-llvm-mingw.sh | ||
|
|
||
| COPY scripts/sccache.sh /scripts/ | ||
| RUN sh /scripts/sccache.sh | ||
|
|
||
| ENV CC_i686_pc_windows_gnullvm=i686-w64-mingw32-clang \ | ||
| CC_x86_64_pc_windows_gnullvm=x86_64-w64-mingw32-clang \ | ||
| CXX_x86_64_pc_windows_gnullvm=x86_64-w64-mingw32-clang++ | ||
|
|
||
| ENV HOST=x86_64-pc-windows-gnullvm | ||
| ENV TARGETS=i686-pc-windows-gnullvm,x86_64-pc-windows-gnullvm | ||
|
|
||
| # We are bootstrapping this target and cannot use previously built artifacts. | ||
| # Without this option Clang is given `"-I/checkout/obj/build/aarch64-pc-windows-gnullvm/ci-llvm/include"` | ||
| # despite no such directory existing: | ||
| # ❯ ls obj/dist-windows-gnullvm/build/aarch64-pc-windows-gnullvm/ -1 | ||
| # llvm | ||
| # stage2 | ||
|
Comment on lines
+33
to
+35
|
||
| ENV NO_DOWNLOAD_CI_LLVM 1 | ||
|
|
||
| ENV RUST_CONFIGURE_ARGS \ | ||
| --enable-extended \ | ||
| --enable-profiler \ | ||
| --enable-sanitizers \ | ||
| --disable-docs \ | ||
| --set llvm.download-ci-llvm=false \ | ||
| --set rust.llvm-tools=false | ||
| # LLVM cross tools are not installed into expected location so copying fails. | ||
| # Probably will solve itself when building from Windows. | ||
| # --enable-full-tools \ | ||
|
|
||
| ENV SCRIPT python3 ../x.py dist --host $HOST --target $TARGETS | ||
|
There was a problem hiding this comment. this file is very similar to Can we share the logic somehow? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| set -ex | ||
|
|
||
| release_date=20250528 | ||
| archive=llvm-mingw-${release_date}-ucrt-ubuntu-22.04-x86_64.tar.xz | ||
| curl -L https://github.com/mstorsjo/llvm-mingw/releases/download/${release_date}/${archive} | \ | ||
| tar --extract --xz --strip 1 --directory /usr/local | ||
|
|
||
| # https://github.com/mstorsjo/llvm-mingw/issues/493 | ||
| for arch in i686 x86_64; do | ||
| ln -s $arch-w64-windows-gnu.cfg /usr/local/bin/$arch-pc-windows-gnu.cfg | ||
| done |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe it's more familiar to use
$instead of❯to indicate a prompt.