From a5d1f4195cda9fdc45c730c628d4ee49c825f210 Mon Sep 17 00:00:00 2001
From: Oscar Benjamin <oscar.j.benjamin@gmail.com>
Date: Sun, 25 Jan 2026 17:53:55 +0000
Subject: [PATCH 01/11] maint: add Windows on ARM64 support

---
 .github/workflows/buildwheel.yml              | 13 ++++++++++--
 ...ws.sh => cibw_before_all_windows_amd64.sh} |  0
 bin/cibw_before_all_windows_arm64.sh          | 20 +++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)
 rename bin/{cibw_before_all_windows.sh => cibw_before_all_windows_amd64.sh} (100%)
 create mode 100755 bin/cibw_before_all_windows_arm64.sh

diff --git a/.github/workflows/buildwheel.yml b/.github/workflows/buildwheel.yml
index 9b48d669..3c87f6dc 100644
--- a/.github/workflows/buildwheel.yml
+++ b/.github/workflows/buildwheel.yml
@@ -10,7 +10,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, ubuntu-22.04-arm, windows-2022, macos-15-intel, macos-14]
+        os: [
+          ubuntu-22.04,
+          ubuntu-22.04-arm,
+          windows-2022,
+          windows-11-arm,
+          macos-15-intel,
+          macos-14,
+        ]
 
     steps:
       - uses: actions/checkout@v6.0.1
@@ -38,7 +45,8 @@ jobs:
         uses: pypa/cibuildwheel@63fd63b352a9a8bdcc24791c9dbee952ee9a8abc # v3.3.0
         env:
           # override setting in pyproject.toml to use msys2 instead of msys64 bash
-          CIBW_BEFORE_ALL_WINDOWS: msys2 -c bin/cibw_before_all_windows.sh
+          CIBW_BEFORE_ALL_WINDOWS_AMD64: msys2 -c bin/cibw_before_all_windows_amd64.sh
+          CIBW_BEFORE_ALL_WINDOWS_ARM64: msys2 -c bin/cibw_before_all_windows_arm64.sh
 
       - uses: actions/upload-artifact@v5
         with:
@@ -78,6 +86,7 @@ jobs:
           ubuntu-24.04-arm,
           windows-2022,
           windows-2025,
+          windows-11-arm,
           macos-15-intel,
           macos-14,
           macos-15,
diff --git a/bin/cibw_before_all_windows.sh b/bin/cibw_before_all_windows_amd64.sh
similarity index 100%
rename from bin/cibw_before_all_windows.sh
rename to bin/cibw_before_all_windows_amd64.sh
diff --git a/bin/cibw_before_all_windows_arm64.sh b/bin/cibw_before_all_windows_arm64.sh
new file mode 100755
index 00000000..5db3dfb1
--- /dev/null
+++ b/bin/cibw_before_all_windows_arm64.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -o errexit
+
+pacman -S --noconfirm \
+    mingw-w64-clang-aarch64-toolchain\
+    mingw-w64-clang-aarch64-tools-git\
+    m4\
+    make\
+    base-devel\
+    autoconf-wrapper\
+    automake-wrapper\
+    libtool\
+    git\
+    #
+
+bin/build_dependencies_unix.sh \
+    --use-gmp-github-mirror\
+    --patch-C23\
+    #

From 0606e709bbb8bb4c6ae744bbd517377adb309fd6 Mon Sep 17 00:00:00 2001
From: Oscar Benjamin <oscar.j.benjamin@gmail.com>
Date: Sun, 25 Jan 2026 18:17:26 +0000
Subject: [PATCH 02/11] Fix env var names in buildwheel.yml

---
 .github/workflows/buildwheel.yml | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/buildwheel.yml b/.github/workflows/buildwheel.yml
index 3c87f6dc..212d6164 100644
--- a/.github/workflows/buildwheel.yml
+++ b/.github/workflows/buildwheel.yml
@@ -41,12 +41,29 @@ jobs:
       - run: echo "PKG_CONFIG_PATH=${{ github.workspace }}/.local/lib/pkgconfig" >> $env:GITHUB_ENV
         if: ${{ startsWith( matrix.os , 'windows' ) }}
 
-      - name: Build wheels
+        # We need to set these environment variables here rather than
+        # pyproject.toml so we can use differnt values for different
+        # architectures. For non-Windows this is just done with $(uname -m)
+        # don't know what that would do in msys2 on Windows when cibuildwheel
+        # parses it.
+
+      - name: Build wheels for windows-2022
+        uses: pypa/cibuildwheel@63fd63b352a9a8bdcc24791c9dbee952ee9a8abc # v3.3.0
+        if: ${{ matrix.os == 'windows-2022' }}
+        env:
+          CIBW_BEFORE_ALL_WINDOWS: msys2 -c bin/cibw_before_all_windows_amd64.sh
+
+      - name: Build wheels for windows-11-arm
         uses: pypa/cibuildwheel@63fd63b352a9a8bdcc24791c9dbee952ee9a8abc # v3.3.0
+        if: ${{ matrix.os == 'windows-11-arm' }}
         env:
-          # override setting in pyproject.toml to use msys2 instead of msys64 bash
-          CIBW_BEFORE_ALL_WINDOWS_AMD64: msys2 -c bin/cibw_before_all_windows_amd64.sh
-          CIBW_BEFORE_ALL_WINDOWS_ARM64: msys2 -c bin/cibw_before_all_windows_arm64.sh
+          CIBW_BEFORE_ALL_WINDOWS: msys2 -c bin/cibw_before_all_windows_arm64.sh
+
+        # After all the Windows-specific steps above this is what actually
+        # #builds the wheels for every other OS:
+
+      - name: Build wheels for any other OS
+        uses: pypa/cibuildwheel@63fd63b352a9a8bdcc24791c9dbee952ee9a8abc # v3.3.0
 
       - uses: actions/upload-artifact@v5
         with:

From c157dc1c684651e63a47e55bea3aba94e7ecb34c Mon Sep 17 00:00:00 2001
From: Oscar Benjamin <oscar.j.benjamin@gmail.com>
Date: Sun, 25 Jan 2026 18:25:01 +0000
Subject: [PATCH 03/11] Set --host to arm64 for Windows on arm64

---
 bin/cibw_before_all_windows_arm64.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/cibw_before_all_windows_arm64.sh b/bin/cibw_before_all_windows_arm64.sh
index 5db3dfb1..399c0ba3 100755
--- a/bin/cibw_before_all_windows_arm64.sh
+++ b/bin/cibw_before_all_windows_arm64.sh
@@ -16,5 +16,6 @@ pacman -S --noconfirm \
 
 bin/build_dependencies_unix.sh \
     --use-gmp-github-mirror\
+    --host arm64-w64-mingw32\
     --patch-C23\
     #

From 4861f0185d6d8680c543bfbae02ba48b86b5253e Mon Sep 17 00:00:00 2001
From: Oscar Benjamin <oscar.j.benjamin@gmail.com>
Date: Sun, 25 Jan 2026 18:40:18 +0000
Subject: [PATCH 04/11] Fix --host

---
 bin/cibw_before_all_windows_arm64.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/cibw_before_all_windows_arm64.sh b/bin/cibw_before_all_windows_arm64.sh
index 399c0ba3..d0f3348d 100755
--- a/bin/cibw_before_all_windows_arm64.sh
+++ b/bin/cibw_before_all_windows_arm64.sh
@@ -16,6 +16,6 @@ pacman -S --noconfirm \
 
 bin/build_dependencies_unix.sh \
     --use-gmp-github-mirror\
-    --host arm64-w64-mingw32\
+    --host aarch64-pc-windows-gnullvm\
     --patch-C23\
     #

From d2e8d0413bf3d91510fd0c58b5fbe6ece0442819 Mon Sep 17 00:00:00 2001
From: Oscar Benjamin <oscar.j.benjamin@gmail.com>
Date: Sun, 25 Jan 2026 18:50:53 +0000
Subject: [PATCH 05/11] Use msystem = clangarm64 for windows arm64

---
 .github/workflows/buildwheel.yml     | 7 ++++++-
 bin/cibw_before_all_windows_arm64.sh | 1 -
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/buildwheel.yml b/.github/workflows/buildwheel.yml
index 212d6164..f251c663 100644
--- a/.github/workflows/buildwheel.yml
+++ b/.github/workflows/buildwheel.yml
@@ -29,7 +29,12 @@ jobs:
       - uses: msys2/setup-msys2@v2.29.0
         with:
           msystem: mingw64
-        if: ${{ startsWith( matrix.os , 'windows' ) }}
+        if: ${{ matrix.os == 'windows-2022' }}
+
+      - uses: msys2/setup-msys2@v2.29.0
+        with:
+          msystem: clangarm64
+        if: ${{ matrix.os == 'windows-11-arm' }}
 
         # Install pkgconfig on Windows from choco rather than from msys and
         # avoid using the Strawberry one.
diff --git a/bin/cibw_before_all_windows_arm64.sh b/bin/cibw_before_all_windows_arm64.sh
index d0f3348d..5db3dfb1 100755
--- a/bin/cibw_before_all_windows_arm64.sh
+++ b/bin/cibw_before_all_windows_arm64.sh
@@ -16,6 +16,5 @@ pacman -S --noconfirm \
 
 bin/build_dependencies_unix.sh \
     --use-gmp-github-mirror\
-    --host aarch64-pc-windows-gnullvm\
     --patch-C23\
     #

From 49291df89435c0f1799427fd359ec586731b7ee4 Mon Sep 17 00:00:00 2001
From: Oscar Benjamin <oscar.j.benjamin@gmail.com>
Date: Sun, 25 Jan 2026 19:04:32 +0000
Subject: [PATCH 06/11] Don't run cibuildwheel twice on Windows

---
 .github/workflows/buildwheel.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/buildwheel.yml b/.github/workflows/buildwheel.yml
index f251c663..edb3d42b 100644
--- a/.github/workflows/buildwheel.yml
+++ b/.github/workflows/buildwheel.yml
@@ -65,10 +65,11 @@ jobs:
           CIBW_BEFORE_ALL_WINDOWS: msys2 -c bin/cibw_before_all_windows_arm64.sh
 
         # After all the Windows-specific steps above this is what actually
-        # #builds the wheels for every other OS:
+        # builds the wheels for every other OS:
 
       - name: Build wheels for any other OS
         uses: pypa/cibuildwheel@63fd63b352a9a8bdcc24791c9dbee952ee9a8abc # v3.3.0
+        if: ${{ !startsWith( matrix.os , 'windows' ) }}
 
       - uses: actions/upload-artifact@v5
         with:

From a7be3bf0fc73fe0ca889c827b2b14a612f6c5a7d Mon Sep 17 00:00:00 2001
From: Oscar Benjamin <oscar.j.benjamin@gmail.com>
Date: Sun, 25 Jan 2026 19:43:56 +0000
Subject: [PATCH 07/11] Don't use fat build for Windows on ARM64

---
 bin/build_dependencies_unix.sh       | 9 ++++++++-
 bin/cibw_before_all_windows_arm64.sh | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/bin/build_dependencies_unix.sh b/bin/build_dependencies_unix.sh
index 6dfdeb12..184da108 100755
--- a/bin/build_dependencies_unix.sh
+++ b/bin/build_dependencies_unix.sh
@@ -18,6 +18,7 @@ set -o errexit
 
 SKIP_GMP=no
 SKIP_MPFR=no
+FAT_GMP_ARG="--enable-fat"
 
 USE_GMP=gmp
 PATCH_GMP_ARM64=no
@@ -37,6 +38,7 @@ do
       echo "  --host <HOST>     - set the host (target) for GMP build"
       echo "  --skip-gmp        - skip building GMP"
       echo "  --skip-mpfr       - skip building MPFR"
+      echo "  --disable-fat     - disable building fat binaries"
       echo
       echo "Legacy options:"
       echo "  --gmp gmp         - build based on GMP (default)"
@@ -83,6 +85,11 @@ do
       SKIP_MPFR=yes
       shift
     ;;
+    --disable-fat)
+      # Disable building fat binaries
+      FAT_GMP_ARG="--disable-assembly"
+      shift
+    ;;
     --patch-gmp-arm64)
       # Needed only for GMP 6.2.1 on OSX arm64 (Apple M1) hardware
       # As of GMP 6.3.0 this patch is no longer needed
@@ -190,7 +197,7 @@ if [ $USE_GMP = "gmp" ]; then
       ./configfsf.guess
 
       ./configure --prefix=$PREFIX\
-        --enable-fat\
+        $FAT_GMP_ARG\
         --enable-shared=yes\
         --enable-static=no\
         --host=$HOST_ARG
diff --git a/bin/cibw_before_all_windows_arm64.sh b/bin/cibw_before_all_windows_arm64.sh
index 5db3dfb1..3aae38b5 100755
--- a/bin/cibw_before_all_windows_arm64.sh
+++ b/bin/cibw_before_all_windows_arm64.sh
@@ -15,6 +15,7 @@ pacman -S --noconfirm \
     #
 
 bin/build_dependencies_unix.sh \
+    --disable-fat\
     --use-gmp-github-mirror\
     --patch-C23\
     #

From fcb49d2e2f0f300842811c14e24bbccb4f4b536d Mon Sep 17 00:00:00 2001
From: Oscar Benjamin <oscar.j.benjamin@gmail.com>
Date: Sun, 25 Jan 2026 20:56:13 +0000
Subject: [PATCH 08/11] Patch FLINT for mingw on arm64

---
 bin/build_dependencies_unix.sh       | 16 ++++++++
 bin/cibw_before_all_windows_arm64.sh |  1 +
 bin/patch-ldd.diff                   | 59 ++++++++++++++++++++++++++++
 3 files changed, 76 insertions(+)
 create mode 100644 bin/patch-ldd.diff

diff --git a/bin/build_dependencies_unix.sh b/bin/build_dependencies_unix.sh
index 184da108..d203e2d5 100755
--- a/bin/build_dependencies_unix.sh
+++ b/bin/build_dependencies_unix.sh
@@ -19,6 +19,7 @@ set -o errexit
 SKIP_GMP=no
 SKIP_MPFR=no
 FAT_GMP_ARG="--enable-fat"
+PATCH_LDD=no
 
 USE_GMP=gmp
 PATCH_GMP_ARM64=no
@@ -39,6 +40,7 @@ do
       echo "  --skip-gmp        - skip building GMP"
       echo "  --skip-mpfr       - skip building MPFR"
       echo "  --disable-fat     - disable building fat binaries"
+      echo "  --patch-ldd       - patch flint to work with ldd (for mingw on arm64)"
       echo
       echo "Legacy options:"
       echo "  --gmp gmp         - build based on GMP (default)"
@@ -101,6 +103,11 @@ do
       PATCH_GMP_C23=yes
       shift
     ;;
+    --patch-ldd)
+      # Needed only for GMP 6.3.0 on OSX arm64 (Apple M1) hardware
+      PATCH_LDD=yes
+      shift
+    ;;
     --use-gmp-github-mirror)
       USE_GMP_GITHUB_MIRROR=yes
       shift
@@ -316,6 +323,15 @@ echo
 curl -O -L https://github.com/flintlib/flint/releases/download/v$FLINTVER/flint-$FLINTVER.tar.gz
 tar xf flint-$FLINTVER.tar.gz
 cd flint-$FLINTVER
+
+  if [ $PATCH_LDD = "yes" ]; then
+    echo
+    echo --------------------------------------------
+    echo "           patching FLINT"
+    echo --------------------------------------------
+    patch -N -Z -p0 < ../../../bin/patch-ldd.diff
+  fi
+
   ./bootstrap.sh
   ./configure --prefix=$PREFIX\
     --host=$HOST_ARG\
diff --git a/bin/cibw_before_all_windows_arm64.sh b/bin/cibw_before_all_windows_arm64.sh
index 3aae38b5..01c38ced 100755
--- a/bin/cibw_before_all_windows_arm64.sh
+++ b/bin/cibw_before_all_windows_arm64.sh
@@ -18,4 +18,5 @@ bin/build_dependencies_unix.sh \
     --disable-fat\
     --use-gmp-github-mirror\
     --patch-C23\
+    --patch-ldd\
     #
diff --git a/bin/patch-ldd.diff b/bin/patch-ldd.diff
new file mode 100644
index 00000000..df2fb955
--- /dev/null
+++ b/bin/patch-ldd.diff
@@ -0,0 +1,59 @@
+diff --git a/Makefile.in b/Makefile.in
+index 0f25aa2b5..cc0e44708 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -416,6 +416,10 @@ endif
+ ifneq ($(SHARED), 0)
+ shared: $(FLINT_DIR)/$(FLINT_LIB_FULL)
+ 
++ifneq ($(strip $(filter gnu% linux-gnu%,@FLINT_BUILD_OS@)),)
++# No command line length limitations under build_os=gnu*|linux-gnu*
++MERGED_OBJS := $(foreach dir,$(DIRS),$($(dir)_OBJS))
++else
+ # The following is to avoid reaching the maximum length of command line
+ # arguments, mainly present on MinGW.
+ define xxx_merged_lobj_rule
+@@ -424,6 +428,7 @@ $(BUILD_DIR)/$(1)_merged.lo: $($(1)_LOBJS) | $(BUILD_DIR)
+ endef
+ $(foreach dir, $(DIRS), $(eval $(call xxx_merged_lobj_rule,$(dir))))
+ MERGED_LOBJS:=$(foreach dir, $(DIRS),$(BUILD_DIR)/$(dir)_merged.lo)
++endif
+ 
+ $(FLINT_DIR)/$(FLINT_LIB_FULL): $(MERGED_LOBJS)
+ 	@echo "Building $(FLINT_LIB_FULL)"
+@@ -437,6 +442,10 @@ endif
+ ifneq ($(STATIC), 0)
+ static: $(FLINT_DIR)/$(FLINT_LIB_STATIC)
+ 
++ifneq ($(strip $(filter gnu% linux-gnu%,@FLINT_BUILD_OS@)),)
++# No command line length limitations under build_os=gnu*|linux-gnu*
++MERGED_OBJS := $(foreach dir,$(DIRS),$($(dir)_OBJS))
++else
+ # The following is to avoid reaching the maximum length of command line
+ # arguments, mainly present on MinGW.
+ define xxx_merged_obj_rule
+@@ -445,6 +454,7 @@ $(BUILD_DIR)/$(1)_merged.o: $($(1)_OBJS) | $(BUILD_DIR)
+ endef
+ $(foreach dir, $(DIRS), $(eval $(call xxx_merged_obj_rule,$(dir))))
+ MERGED_OBJS:=$(foreach dir, $(DIRS),$(BUILD_DIR)/$(dir)_merged.o)
++endif
+ 
+ $(FLINT_DIR)/$(FLINT_LIB_STATIC): $(MERGED_OBJS)
+ 	@echo "Building $(FLINT_LIB_STATIC)"
+diff --git a/configure.ac b/configure.ac
+index 511d0be9a..9f161e490 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -164,8 +164,12 @@ fi
+ 
+ dnl Get system triplet
+ dnl NOTE: This is already invoked from LT_INIT
++dnl AC_CANONICAL_BUILD
+ dnl AC_CANONICAL_HOST
+ 
++FLINT_BUILD_OS="${build_os}"
++AC_SUBST(FLINT_BUILD_OS)
++
+ ################################################################################
+ # configure headers
+ ################################################################################

From eca229b1b4b3bdf8a0dce9d24fba65881aa41974 Mon Sep 17 00:00:00 2001
From: Oscar Benjamin <oscar.j.benjamin@gmail.com>
Date: Sun, 25 Jan 2026 21:28:37 +0000
Subject: [PATCH 09/11] Fix patch command

---
 bin/build_dependencies_unix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/build_dependencies_unix.sh b/bin/build_dependencies_unix.sh
index d203e2d5..aaec4531 100755
--- a/bin/build_dependencies_unix.sh
+++ b/bin/build_dependencies_unix.sh
@@ -329,7 +329,7 @@ cd flint-$FLINTVER
     echo --------------------------------------------
     echo "           patching FLINT"
     echo --------------------------------------------
-    patch -N -Z -p0 < ../../../bin/patch-ldd.diff
+    patch -N -Z -p1 < ../../../bin/patch-ldd.diff
   fi
 
   ./bootstrap.sh

From ad01e8374e37dc0e0dd49aff84bf396aa1b15618 Mon Sep 17 00:00:00 2001
From: Oscar Benjamin <oscar.j.benjamin@gmail.com>
Date: Sun, 25 Jan 2026 22:38:55 +0000
Subject: [PATCH 10/11] Fix the ldd patch so that it works on Windows

---
 bin/patch-ldd.diff | 63 +++++++++++++++-------------------------------
 1 file changed, 20 insertions(+), 43 deletions(-)

diff --git a/bin/patch-ldd.diff b/bin/patch-ldd.diff
index df2fb955..718a7ac7 100644
--- a/bin/patch-ldd.diff
+++ b/bin/patch-ldd.diff
@@ -1,59 +1,36 @@
 diff --git a/Makefile.in b/Makefile.in
-index 0f25aa2b5..cc0e44708 100644
+index 0f25aa2b5..0c2f9dad9 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -416,6 +416,10 @@ endif
+@@ -416,14 +416,7 @@ endif
  ifneq ($(SHARED), 0)
  shared: $(FLINT_DIR)/$(FLINT_LIB_FULL)
  
-+ifneq ($(strip $(filter gnu% linux-gnu%,@FLINT_BUILD_OS@)),)
-+# No command line length limitations under build_os=gnu*|linux-gnu*
-+MERGED_OBJS := $(foreach dir,$(DIRS),$($(dir)_OBJS))
-+else
- # The following is to avoid reaching the maximum length of command line
- # arguments, mainly present on MinGW.
- define xxx_merged_lobj_rule
-@@ -424,6 +428,7 @@ $(BUILD_DIR)/$(1)_merged.lo: $($(1)_LOBJS) | $(BUILD_DIR)
- endef
- $(foreach dir, $(DIRS), $(eval $(call xxx_merged_lobj_rule,$(dir))))
- MERGED_LOBJS:=$(foreach dir, $(DIRS),$(BUILD_DIR)/$(dir)_merged.lo)
-+endif
+-# The following is to avoid reaching the maximum length of command line
+-# arguments, mainly present on MinGW.
+-define xxx_merged_lobj_rule
+-$(BUILD_DIR)/$(1)_merged.lo: $($(1)_LOBJS) | $(BUILD_DIR)
+-	@$(LD) -r $($(1)_LOBJS) -o $(BUILD_DIR)/$(1)_merged.lo
+-endef
+-$(foreach dir, $(DIRS), $(eval $(call xxx_merged_lobj_rule,$(dir))))
+-MERGED_LOBJS:=$(foreach dir, $(DIRS),$(BUILD_DIR)/$(dir)_merged.lo)
++MERGED_LOBJS := $(foreach dir,$(DIRS),$($(dir)_OBJS))
  
  $(FLINT_DIR)/$(FLINT_LIB_FULL): $(MERGED_LOBJS)
  	@echo "Building $(FLINT_LIB_FULL)"
-@@ -437,6 +442,10 @@ endif
+@@ -437,14 +430,7 @@ endif
  ifneq ($(STATIC), 0)
  static: $(FLINT_DIR)/$(FLINT_LIB_STATIC)
  
-+ifneq ($(strip $(filter gnu% linux-gnu%,@FLINT_BUILD_OS@)),)
-+# No command line length limitations under build_os=gnu*|linux-gnu*
+-# The following is to avoid reaching the maximum length of command line
+-# arguments, mainly present on MinGW.
+-define xxx_merged_obj_rule
+-$(BUILD_DIR)/$(1)_merged.o: $($(1)_OBJS) | $(BUILD_DIR)
+-	@$(LD) -r $($(1)_OBJS) -o $(BUILD_DIR)/$(1)_merged.o
+-endef
+-$(foreach dir, $(DIRS), $(eval $(call xxx_merged_obj_rule,$(dir))))
+-MERGED_OBJS:=$(foreach dir, $(DIRS),$(BUILD_DIR)/$(dir)_merged.o)
 +MERGED_OBJS := $(foreach dir,$(DIRS),$($(dir)_OBJS))
-+else
- # The following is to avoid reaching the maximum length of command line
- # arguments, mainly present on MinGW.
- define xxx_merged_obj_rule
-@@ -445,6 +454,7 @@ $(BUILD_DIR)/$(1)_merged.o: $($(1)_OBJS) | $(BUILD_DIR)
- endef
- $(foreach dir, $(DIRS), $(eval $(call xxx_merged_obj_rule,$(dir))))
- MERGED_OBJS:=$(foreach dir, $(DIRS),$(BUILD_DIR)/$(dir)_merged.o)
-+endif
  
  $(FLINT_DIR)/$(FLINT_LIB_STATIC): $(MERGED_OBJS)
  	@echo "Building $(FLINT_LIB_STATIC)"
-diff --git a/configure.ac b/configure.ac
-index 511d0be9a..9f161e490 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -164,8 +164,12 @@ fi
- 
- dnl Get system triplet
- dnl NOTE: This is already invoked from LT_INIT
-+dnl AC_CANONICAL_BUILD
- dnl AC_CANONICAL_HOST
- 
-+FLINT_BUILD_OS="${build_os}"
-+AC_SUBST(FLINT_BUILD_OS)
-+
- ################################################################################
- # configure headers
- ################################################################################

From 91f985a679a8dfd770a2b79c663fd267c924c853 Mon Sep 17 00:00:00 2001
From: Oscar Benjamin <oscar.j.benjamin@gmail.com>
Date: Sun, 25 Jan 2026 23:46:50 +0000
Subject: [PATCH 11/11] Fix patch

---
 bin/patch-ldd.diff | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/patch-ldd.diff b/bin/patch-ldd.diff
index 718a7ac7..81b06b92 100644
--- a/bin/patch-ldd.diff
+++ b/bin/patch-ldd.diff
@@ -1,5 +1,5 @@
 diff --git a/Makefile.in b/Makefile.in
-index 0f25aa2b5..0c2f9dad9 100644
+index 0f25aa2b5..937fffa10 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -416,14 +416,7 @@ endif
@@ -14,7 +14,7 @@ index 0f25aa2b5..0c2f9dad9 100644
 -endef
 -$(foreach dir, $(DIRS), $(eval $(call xxx_merged_lobj_rule,$(dir))))
 -MERGED_LOBJS:=$(foreach dir, $(DIRS),$(BUILD_DIR)/$(dir)_merged.lo)
-+MERGED_LOBJS := $(foreach dir,$(DIRS),$($(dir)_OBJS))
++MERGED_LOBJS:=$(foreach dir,$(DIRS),$($(dir)_LOBJS))
  
  $(FLINT_DIR)/$(FLINT_LIB_FULL): $(MERGED_LOBJS)
  	@echo "Building $(FLINT_LIB_FULL)"
@@ -30,7 +30,7 @@ index 0f25aa2b5..0c2f9dad9 100644
 -endef
 -$(foreach dir, $(DIRS), $(eval $(call xxx_merged_obj_rule,$(dir))))
 -MERGED_OBJS:=$(foreach dir, $(DIRS),$(BUILD_DIR)/$(dir)_merged.o)
-+MERGED_OBJS := $(foreach dir,$(DIRS),$($(dir)_OBJS))
++MERGED_OBJS:=$(foreach dir,$(DIRS),$($(dir)_OBJS))
  
  $(FLINT_DIR)/$(FLINT_LIB_STATIC): $(MERGED_OBJS)
  	@echo "Building $(FLINT_LIB_STATIC)"