feat: Add cross wrappers for GNU containers

Cross wrappers for musl containers are already provided by crossdev[0]. To achieve the save effect on Debian containers, create similar wrappers.
exein-io · Oct 27, 2024 · 5d1959e · 5d1959e
1 parent bea3ddf
commit 5d1959e
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 0 deletions.
diff --git a/containers/Dockerfile.cross-aarch64-unknown-linux-gnu b/containers/Dockerfile.cross-aarch64-unknown-linux-gnu
@@ -29,8 +29,13 @@ RUN dpkg --add-architecture arm64 \
     && ./llvm.sh 18 \
     && rm -f llvm.sh \
     && rm -rf /var/lib/apt/lists/* \
+    && mkdir -p /etc/clang/cross \
     && useradd -m -G users -s /bin/bash cross
 
+COPY clang-cfg/aarch64-unknown-linux-gnu.cfg /etc/clang/cross
+COPY wrappers/aarch64-unknown-linux-gnu-clang /usr/bin
+COPY wrappers/aarch64-unknown-linux-gnu-clang++ /usr/bin
+
 USER cross
 WORKDIR /home/cross
 

diff --git a/containers/Dockerfile.cross-riscv64gc-unknown-linux-gnu b/containers/Dockerfile.cross-riscv64gc-unknown-linux-gnu
@@ -40,6 +40,10 @@ RUN dpkg --add-architecture riscv64 \
     && rm -rf /var/lib/apt/lists/* \
     && useradd -m -G users -s /bin/bash cross
 
+COPY clang-cfg/riscv64-unknown-linux-gnu.cfg /etc/clang/cross
+COPY wrappers/riscv64-unknown-linux-gnu-clang /usr/bin
+COPY wrappers/riscv64-unknown-linux-gnu-clang++ /usr/bin
+
 USER cross
 WORKDIR /home/cross
 

diff --git a/containers/clang-cfg/aarch64-unknown-linux-gnu.cfg b/containers/clang-cfg/aarch64-unknown-linux-gnu.cfg
@@ -0,0 +1,3 @@
+--sysroot=/usr/aarch64-unknown-linux-gnu
+--target=aarch64-unknown-linux-gnu
+-fuse-ld=lld
diff --git a/containers/clang-cfg/riscv64-unknown-linux-gnu.cfg b/containers/clang-cfg/riscv64-unknown-linux-gnu.cfg
@@ -0,0 +1,3 @@
+--sysroot=/usr/riscv64-unknown-linux-gnu
+--target=riscv64-unknown-linux-gnu
+-fuse-ld=lld
diff --git a/containers/wrappers/aarch64-unknown-linux-gnu-clang b/containers/wrappers/aarch64-unknown-linux-gnu-clang
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec clang --no-default-config --config="/etc/clang/cross/aarch64-unknown-linux-gnu.cfg" ${@}
diff --git a/containers/wrappers/aarch64-unknown-linux-gnu-clang++ b/containers/wrappers/aarch64-unknown-linux-gnu-clang++
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec clang++ --no-default-config --config="/etc/clang/cross/aarch64-unknown-linux-gnu.cfg" ${@}
diff --git a/containers/wrappers/riscv64-unknown-linux-gnu-clang b/containers/wrappers/riscv64-unknown-linux-gnu-clang
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec clang --no-default-config --config="/etc/clang/cross/riscv64-unknown-linux-gnu.cfg" ${@}
diff --git a/containers/wrappers/riscv64-unknown-linux-gnu-clang++ b/containers/wrappers/riscv64-unknown-linux-gnu-clang++
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec clang++ --no-default-config --config="/etc/clang/cross/riscv64-unknown-linux-gnu.cfg" ${@}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/bin/sh
		exec clang --no-default-config --config="/etc/clang/cross/aarch64-unknown-linux-gnu.cfg" ${@}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/bin/sh
		exec clang++ --no-default-config --config="/etc/clang/cross/aarch64-unknown-linux-gnu.cfg" ${@}