Skip to content

Commit c71766b

Browse files
committed
install x86 tools and configure x86 gnu build
1 parent 86694cc commit c71766b

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

support/rust-build/aarch64-unknown-linux-gnu/build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ set -e
44

55
git clone --recursive --depth 1 --shallow-submodules https://github.com/esp-rs/rust.git -b "esp-${RELEASE_VERSION}"
66
cd rust
7-
python3 src/bootstrap/configure.py --target aarch64-unknown-linux-gnu --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_VERSION}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --enable-lld
7+
python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_VERSION}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --enable-lld
8+
89
python3 x.py dist --stage 2

support/rust-build/x86_64-unknown-linux-gnu/Containerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ ENV LC_ALL=C.UTF-8
55
ENV LANG=C.UTF-8
66
RUN apt-get update \
77
&& apt-get install -y vim nano git curl gcc ninja-build cmake libudev-dev python3 python3-pip libusb-1.0-0 libssl-dev \
8-
pkg-config libtinfo5
8+
pkg-config libtinfo5 \
9+
gcc-x86-64-linux-gnu \
10+
g++-x86-64-linux-gnu
911

1012
RUN adduser --disabled-password --gecos "" rust
1113
USER rust

support/rust-build/x86_64-unknown-linux-gnu/build.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ set -e
44

55
git clone --recursive --depth 1 --shallow-submodules https://github.com/esp-rs/rust.git -b "esp-${RELEASE_VERSION}"
66
cd rust
7-
python3 src/bootstrap/configure.py --target x86_64-unknown-linux-gnu --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_VERSION}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --enable-lld
8-
python3 x.py dist --stage 2
7+
python3 src/bootstrap/configure.py --experimental-targets=Xtensa --release-channel=nightly --release-description="${RELEASE_VERSION}" --enable-extended --enable-cargo-native-static --tools=clippy,cargo,rustfmt,rust-analyzer-proc-macro-srv,src --dist-compression-formats='xz' --enable-lld --host aarch64-unknown-linux-gnu,x86_64-unknown-linux-gnu --target aarch64-unknown-linux-gnu,x86_64-unknown-linux-gnu --build aarch64-unknown-linux-gnu
8+
9+
python3 x.py dist --stage 2

0 commit comments

Comments
 (0)