diff options
Diffstat (limited to 'main/meson/abuild-meson')
| -rwxr-xr-x | main/meson/abuild-meson | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/meson/abuild-meson b/main/meson/abuild-meson index 19d2c2a32ac..2e56c411496 100755 --- a/main/meson/abuild-meson +++ b/main/meson/abuild-meson @@ -5,12 +5,11 @@ # mostly taken from https://github.com/void-linux/void-packages/blob/22bf95cf356bf1a09212733d775d447d011f70b0/common/build-style/meson.sh if [ "$CHOST" != "$CBUILD" ]; then - _target_arch="$(hostspec_to_arch $CHOST)" _meson_crossfile="abuild-meson.cross" _meson_target_endian=little # just the first part of the hostspec - _meson_target_cpu=${CHOST%%-*} - case "$_target_arch" in + _meson_target_cpu="$CARCH" + case "$CARCH" in arm*) _meson_cpu_family=arm ;; @@ -47,10 +46,9 @@ if [ "$CHOST" != "$CBUILD" ]; then cpu = '$_meson_target_cpu' endian = '$_meson_target_endian' EOF - unset _meson_target_cpu _meson_target_endian _meson_cpu_family _target_arch + unset _meson_target_cpu _meson_target_endian _meson_cpu_family fi -# TODO: enable LTO once our GCC works with LTO by default exec meson setup \ --prefix=/usr \ --libdir=/usr/lib \ @@ -71,5 +69,7 @@ exec meson setup \ -Db_lto=false \ -Db_staticpic=true \ -Db_pie=true \ + -Dpython.bytecompile=0 \ + -Dwerror=false \ ${_meson_crossfile:+--cross-file=$_meson_crossfile} \ "$@" |