Skip to content

Commit 2f34270

Browse files
committed
Add back --disable-assembly for win-arm64
1 parent 723bc6c commit 2f34270

2 files changed

Lines changed: 12 additions & 1 deletion

File tree

bin/build_dependencies_unix.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ SKIP_MPFR=no
2121
PATCH_GMP_C23=no
2222
PATCH_LDD=no
2323
PATCH_IMMINTRIN=no
24+
GMP_FAT_ARG="--enable-fat"
25+
GMP_ASSEMBLY_ARG=
2426
HOST_ARG=
2527

2628
USE_GMP=gmp
@@ -42,6 +44,7 @@ do
4244
echo " --host <HOST> - set the host (target) for GMP build"
4345
echo " --skip-gmp - skip building GMP"
4446
echo " --skip-mpfr - skip building MPFR"
47+
echo " --disable-assembly - disable GMP assembly routines"
4548
echo " --patch-ldd - patch flint shared linking for mingw on arm64"
4649
echo " --patch-immintrin - patch flint arm64 msvc header to avoid immintrin.h"
4750
echo
@@ -90,6 +93,12 @@ do
9093
SKIP_MPFR=yes
9194
shift
9295
;;
96+
--disable-assembly)
97+
# GMP does not allow --enable-fat together with --disable-assembly.
98+
GMP_FAT_ARG=
99+
GMP_ASSEMBLY_ARG="--disable-assembly"
100+
shift
101+
;;
93102
--patch-gmp-arm64)
94103
# Needed only for GMP 6.2.1 on OSX arm64 (Apple M1) hardware
95104
# As of GMP 6.3.0 this patch is no longer needed
@@ -207,7 +216,8 @@ if [ "$USE_GMP" = "gmp" ]; then
207216
./configfsf.guess
208217

209218
./configure --prefix=$PREFIX\
210-
--enable-fat\
219+
$GMP_FAT_ARG\
220+
$GMP_ASSEMBLY_ARG\
211221
--enable-shared=yes\
212222
--enable-static=no\
213223
--host=$HOST_ARG

bin/cibw_before_all_windows_arm64.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ pacman -S --noconfirm \
1818
bin/cibw_before_all_windows.sh \
1919
arm64 \
2020
--use-gmp-github-mirror \
21+
--disable-assembly \
2122
--host aarch64-w64-mingw32 \
2223
--patch-C23 \
2324
--patch-ldd \

0 commit comments

Comments
 (0)