From e899d5156884793d8f80baa940e3499cbac4bfe3 Mon Sep 17 00:00:00 2001
From: Guy Shimko <guy.shimko@gmail.com>
Date: Tue, 1 Apr 2025 23:59:55 +0300
Subject: [PATCH] fixup! build: install musl toolchains in the dockerfile

---
 Dockerfile                                 |  2 +-
 Makefile                                   |  2 +-
 src/compilation/install_musl_toolchains.sh | 11 +----------
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 41b60b9..f47f5ae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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
 
diff --git a/Makefile b/Makefile
index 5791380..283345d 100644
--- a/Makefile
+++ b/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)
 
diff --git a/src/compilation/install_musl_toolchains.sh b/src/compilation/install_musl_toolchains.sh
index b1c6d3c..e3fc57c 100755
--- a/src/compilation/install_musl_toolchains.sh
+++ b/src/compilation/install_musl_toolchains.sh
@@ -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