fixup! build: install musl toolchains in the dockerfile
This commit is contained in:
parent
01e60acff0
commit
e899d51568
@ -31,7 +31,7 @@ RUN apt update && apt install -y \
|
||||
xz-utils
|
||||
|
||||
# Install musl-based toolchains.
|
||||
ENV MUSL_INSTALL_DIR="/opt/musl-cross"
|
||||
ENV MUSL_INSTALL_DIR="/usr/"
|
||||
COPY src/compilation/install_musl_toolchains.sh .
|
||||
RUN ./install_musl_toolchains.sh
|
||||
|
||||
|
2
Makefile
2
Makefile
@ -59,7 +59,7 @@ $(PYTHON_TARGETS): build-with-python-%:
|
||||
|
||||
_build-%: symlink-git-packages download-packages build-docker-image
|
||||
mkdir -p build
|
||||
docker run --user $(shell id -u):$(shell id -g) \
|
||||
docker run -it --user $(shell id -u):$(shell id -g) \
|
||||
--rm --volume .:/app/gdb gdb-static env TERM=xterm-256color \
|
||||
/app/gdb/src/compilation/build.sh $* /app/gdb/build/ /app/gdb/src $(WITH_PYTHON)
|
||||
|
||||
|
@ -29,15 +29,6 @@ for ARCH in "${ARCHS[@]}"; do
|
||||
wget -q --show-progress "$URL"
|
||||
|
||||
echo "Extracting $TOOLCHAIN_TAR..."
|
||||
tar -xzf "$TOOLCHAIN_TAR"
|
||||
tar -xzf "$TOOLCHAIN_TAR" --strip-components=1
|
||||
rm "$TOOLCHAIN_TAR"
|
||||
done
|
||||
|
||||
# Add the installed toolchains to the PATH.
|
||||
echo "Updating PATH..."
|
||||
MUSL_PATHS=""
|
||||
for dir in /opt/musl-cross/*/bin; do
|
||||
MUSL_PATHS="$dir:$MUSL_PATHS"
|
||||
done
|
||||
|
||||
echo "PATH=$MUSL_PATHS:$PATH" >> ~/.bashrc
|
||||
|
Loading…
x
Reference in New Issue
Block a user