TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-18 17:00:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: use the correct cc/c++ binaries in meson config

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2025-08-08 19:20:12 +02:00
parent 51d3993de6
commit e82f2c8172
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
.docker/install-static-libs.sh
View File

@ -254,7 +254,6 @@ for target_arch in ${TARGET_ARCH_STR//,/ }; do
export TRIPLETS="--host=$TARGET --target=$TARGET --build=$ARCH-alpine-linux-musl" export TRIPLETS="--host=$TARGET --target=$TARGET --build=$ARCH-alpine-linux-musl"
export BOOST_CMAKE_ARGS="-DBOOST_CONTEXT_ARCHITECTURE=$BOOST_CONTEXT_ARCH" export BOOST_CMAKE_ARGS="-DBOOST_CONTEXT_ARCHITECTURE=$BOOST_CONTEXT_ARCH"
export LIBUCONTEXT_MAKE_ARGS="ARCH=$CARCH" export LIBUCONTEXT_MAKE_ARGS="ARCH=$CARCH"
export MESON_CROSS_FILE="--cross-file=/tmp/meson-$CARCH.txt"
endian="little" endian="little"
case "$CARCH" in case "$CARCH" in
@ -263,21 +262,6 @@ for target_arch in ${TARGET_ARCH_STR//,/ }; do
;; ;;
esac esac
cat <<EOF > /tmp/meson-$CARCH.txt
[binaries]
c = '$TARGET-clang'
cpp = '$TARGET-clang++'
ld = '$TARGET-clang'
ar = '$TARGET-ar'
strip = '$TARGET-strip'
[host_machine]
system = 'linux'
cpu_family = '$CARCH'
cpu = '$CARCH'
endian = '$endian'
EOF
export SYSROOT="/opt/cross/O2" export SYSROOT="/opt/cross/O2"
export PATH="$SYSROOT/usr/lib/ccache/bin:$SYSROOT/usr/bin:$PATH" export PATH="$SYSROOT/usr/lib/ccache/bin:$SYSROOT/usr/bin:$PATH"
export WORKROOT="$HOME/pkgs" export WORKROOT="$HOME/pkgs"
@ -352,6 +336,23 @@ EOF
;; ;;
esac esac
export MESON_CROSS_FILE="--cross-file=/tmp/meson-$CARCH-$COMPILER.txt"
cat <<EOF > /tmp/meson-$CARCH-$COMPILER.txt
[binaries]
c = '$CC'
cpp = '$CXX'
ld = '$CC'
ar = '$TARGET-ar'
strip = '$TARGET-strip'
[host_machine]
system = 'linux'
cpu_family = '$CARCH'
cpu = '$CARCH'
endian = '$endian'
EOF
cd "$WORKROOT" cd "$WORKROOT"
mkdir -p "$WORKSUBDIR" mkdir -p "$WORKSUBDIR"