mirror of
https://github.com/mhx/dwarfs.git
synced 2025-09-15 07:16:13 -04:00
fix: use the correct cc/c++ binaries in meson config
This commit is contained in:
parent
51d3993de6
commit
e82f2c8172
@ -254,7 +254,6 @@ for target_arch in ${TARGET_ARCH_STR//,/ }; do
|
||||
export TRIPLETS="--host=$TARGET --target=$TARGET --build=$ARCH-alpine-linux-musl"
|
||||
export BOOST_CMAKE_ARGS="-DBOOST_CONTEXT_ARCHITECTURE=$BOOST_CONTEXT_ARCH"
|
||||
export LIBUCONTEXT_MAKE_ARGS="ARCH=$CARCH"
|
||||
export MESON_CROSS_FILE="--cross-file=/tmp/meson-$CARCH.txt"
|
||||
|
||||
endian="little"
|
||||
case "$CARCH" in
|
||||
@ -263,21 +262,6 @@ for target_arch in ${TARGET_ARCH_STR//,/ }; do
|
||||
;;
|
||||
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 PATH="$SYSROOT/usr/lib/ccache/bin:$SYSROOT/usr/bin:$PATH"
|
||||
export WORKROOT="$HOME/pkgs"
|
||||
@ -352,6 +336,23 @@ EOF
|
||||
;;
|
||||
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"
|
||||
mkdir -p "$WORKSUBDIR"
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user