Fix Cygwin patching after its update (#190)

Windows-on-ARM-Experiments · Sep 6, 2024 · 9a90bea · 9a90bea
1 parent b5edb17
commit 9a90bea
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 26 deletions.
diff --git a/.github/scripts/binutils/build.sh b/.github/scripts/binutils/build.sh
@@ -19,13 +19,10 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$BINUTILS_BUILD_PATH/Makefile" ]]; then
         case "$PLATFORM" in
             *cygwin*)
                 TARGET_OPTIONS="$TARGET_OPTIONS \
-                    --disable-bootstrap \
                     --enable-static \
                     --enable-shared \
                     --enable-host-shared \
-                    --enable-64-bit-bfd \
                     --enable-install-libiberty \
-                    --enable-targets=x86_64-pep \
                     --with-sysroot=$TOOLCHAIN_PATH \
                     --with-build-sysroot=$TOOLCHAIN_PATH \
                     --with-system-zlib \

diff --git a/.github/scripts/binutils/patch-cygwin.sh b/.github/scripts/binutils/patch-cygwin.sh
@@ -18,8 +18,7 @@ echo "::group::Patch Cygwin binutils"
     fi
 
     PATCH_DIR=$SOURCE_PATH/cygwin-packages/binutils
-    patch -p2 -i $PATCH_DIR/binutils-2.42-cygwin-config-rpath.patch
-    patch -p2 -i $PATCH_DIR/binutils-2.42-cygwin-pep-dll-double-definition.patch
+    patch -p2 -i $PATCH_DIR/binutils-2.43-cygwin-config-rpath.patch
 echo "::endgroup::"
 
 echo 'Success!'
diff --git a/.github/scripts/toolchain/patch-cygwin.sh b/.github/scripts/toolchain/patch-cygwin.sh
@@ -50,8 +50,6 @@ echo "::group::Patch Cygwin"
     if [[ "$STAGE" = "1" ]]; then
         patch -p1 -i $PATCH_DIR/0002-after-autogen.patch
     fi
-
-    patch -p1 -i $PATCHES_PATH/cygwin/0003-master.patch
 echo "::endgroup::"
 
 echo 'Success!'
diff --git a/patches/cygwin/0003-master.patch b/patches/cygwin/0003-master.patch