aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Nikita Popov <nikita.ppv@gmail.com>2021-04-30 15:49:14 +0200
committerGravatar GitHub <noreply@github.com>2021-04-30 14:49:14 +0100
commit84947c3aeb5ff82ca47459e975dc496a4c374d42 (patch)
tree4593310a945c8404e2b11daf1dcc8f5ac14af3b8
parent181b3575afc392c704ae3be02baf0c4b8150cd87 (diff)
[php] Fix i386 build (#5692)
It is now necessary to specify the --build architecture for -m32 builds, otherwise we'll end up using x64 assembly files.
-rwxr-xr-xprojects/php/build.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/projects/php/build.sh b/projects/php/build.sh
index fbef4895..d082e260 100755
--- a/projects/php/build.sh
+++ b/projects/php/build.sh
@@ -28,9 +28,15 @@ export ONIG_LIBS="-L$PWD/oniguruma/src/.libs -l:libonig.a"
export CFLAGS="$CFLAGS -fno-sanitize=object-size"
export CXXFLAGS="$CXXFLAGS -fno-sanitize=object-size"
+# Make sure the right assembly files are picked
+BUILD_FLAG=""
+if [ "$ARCHITECTURE" = "i386" ]; then
+ BUILD_FLAG="--build=i686-pc-linux-gnu"
+fi
+
# build project
./buildconf
-./configure \
+./configure $BUILD_FLAG \
--disable-all \
--enable-debug-assertions \
--enable-option-checking=fatal \