Skip to content

Commit 7f3b18a

Browse files
committed
Fix arm32 build running in arm64 machine
1 parent eaf68a3 commit 7f3b18a

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

configure.ac

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ sinclude(binreloc.m4)
7373

7474
dnl ############################# ADD TESTS BELOW ##############################
7575

76-
AC_CANONICAL_BUILD
77-
CPU_TYPE=$build_cpu
76+
AC_CANONICAL_HOST
77+
CPU_TYPE=$host_cpu
7878
AC_SUBST(CPU_TYPE)
7979

80-
case "$build" in
80+
case "$host" in
8181
aarch64-*-darwin*)
8282
VCPKG_TRIPLET=fb-arm64-osx
8383
;;
@@ -118,7 +118,7 @@ STD_EDITLINE=false
118118
dnl Test for special ar options?
119119
AR_OPT_CHECK=false
120120

121-
case "$build" in
121+
case "$host" in
122122
aarch64-*-darwin*)
123123
MAKEFILE_PREFIX=darwin_aarch64
124124
MAKEFILE_POSTFIX=darwin
@@ -176,7 +176,7 @@ dnl CPU_TYPE=ppc64
176176

177177
amd64-*-freebsd* | x86_64*-*-freebsd* | x86_64*-*-k*bsd*-gnu)
178178
MAKEFILE_PREFIX=freebsd_amd64
179-
case "$build" in
179+
case "$host" in
180180
x86_64*-*-k*bsd-gnu) # Debian/kFreeBSD
181181
PLATFORM=GENTOOFREEBSD
182182
INSTALL_PREFIX=linux
@@ -232,7 +232,7 @@ dnl CPU_TYPE=ppc64
232232

233233
*-*-freebsd* | *-*-k*bsd*-gnu)
234234
MAKEFILE_PREFIX=freebsd
235-
case "$build" in
235+
case "$host" in
236236
*-*-k*bsd-gnu) # Debian/kFreeBSD
237237
PLATFORM=GENTOOFREEBSD
238238
INSTALL_PREFIX=linux
@@ -534,7 +534,7 @@ dnl CPU_TYPE=ppc64
534534
;;
535535

536536
*)
537-
AC_MSG_ERROR(unsupported platform ${build})
537+
AC_MSG_ERROR(unsupported platform ${host})
538538
;;
539539
esac
540540

@@ -651,7 +651,7 @@ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
651651
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
652652
LIBS="$LIBS $PTHREAD_LIBS"
653653

654-
case "$build" in
654+
case "$host" in
655655
*-*-darwin*)
656656
CFLAGS="$CFLAGS -I${VCPKG_INSTALLED}/include"
657657
CXXFLAGS="$CXXFLAGS -nostdinc++ -isystem ${VCPKG_INSTALLED}/include/c++/v1 -I${VCPKG_INSTALLED}/include"
@@ -1330,7 +1330,7 @@ dnl # output
13301330
fi
13311331
fi
13321332
1333-
case "$build" in
1333+
case "$host" in
13341334
*-*-darwin*)
13351335
cp -a $VCPKG_INSTALLED/lib/libicu* gen/\$fb_tgt/firebird/lib/
13361336
install_name_tool -id @rpath/lib/libicuuc.dylib gen/\$fb_tgt/firebird/lib/libicuuc.dylib

0 commit comments

Comments
 (0)