fix: rust prefix paths
This commit is contained in:
parent
f851b9a1ce
commit
c3a68a41b9
1 changed files with 5 additions and 17 deletions
|
@ -73,7 +73,6 @@ COPY --from=musl . /
|
|||
COPY --from=gcc /usr/lib64/* /usr/lib/
|
||||
RUN tar -xzf ${MRUSTC_SRC_FILE}
|
||||
RUN mv lrvick-mrustc-* mrustc
|
||||
WORKDIR mrustc
|
||||
ENV MRUSTC_TARGET_VER=1.54
|
||||
ENV RUSTC_VERSION=1.54.0
|
||||
ENV RUSTC_TARGET=x86_64-unknown-linux-musl
|
||||
|
@ -83,7 +82,8 @@ ENV RUSTC_INSTALL_BINDIR=bin
|
|||
ENV OUTDIR_SUF=
|
||||
RUN <<-EOF
|
||||
set -eux
|
||||
cp ../rustc-1.54.0-src.tar.gz .
|
||||
cp rustc-1.54.0-src.tar.gz mrustc
|
||||
cd mrustc
|
||||
tar -xzf rustc-1.54.0-src.tar.gz
|
||||
cd rustc-1.54.0-src
|
||||
patch -p0 < ../rustc-1.54.0-src.patch
|
||||
|
@ -94,21 +94,9 @@ RUN <<-EOF
|
|||
make -f minicargo.mk LLVM_CONFIG=/usr/bin/llvm-config output/rustc
|
||||
make -f minicargo.mk LLVM_CONFIG=/usr/bin/llvm-config output/cargo
|
||||
make -C run_rustc LLVM_CONFIG=/usr/bin/llvm-config
|
||||
cp -R run_rustc/output/prefix ../rust-1.54.0
|
||||
EOF
|
||||
WORKDIR ../rust-1.54.0
|
||||
RUN <<-EOF
|
||||
set -eux
|
||||
mkdir -p usr/bin usr/lib
|
||||
cp -R ../mrustc/run_rustc/output/prefix/* .
|
||||
rm -rf tmp
|
||||
rm bin/rustc
|
||||
mv bin/rustc_binary usr/bin/rustc
|
||||
mv bin/cargo usr/bin/
|
||||
mv lib/rustlib usr/lib/rustlib
|
||||
mv usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_driver.so usr/lib/
|
||||
EOF
|
||||
WORKDIR ../
|
||||
COPY <<-EOF build.sh
|
||||
COPY <<-'EOF' build.sh
|
||||
VERSION=${1}
|
||||
BUILD_VERSION=${2}
|
||||
PREFIX=/rust-${VERSION}
|
||||
|
@ -130,7 +118,7 @@ COPY <<-EOF build.sh
|
|||
--enable-vendor \
|
||||
--dist-compression-formats=gz \
|
||||
--python="python3" \
|
||||
--local-rust-root="${BUILD_PREFIX}/usr" \
|
||||
--local-rust-root="${BUILD_PREFIX}" \
|
||||
--prefix="${PREFIX}/usr" \
|
||||
--sysconfdir="${PREFIX}/etc" \
|
||||
--release-channel="stable" \
|
||||
|
|
Loading…
Reference in a new issue