Fix missing rebuild of all MinGW libraries

Author: Blackhex

.github/scripts/build.sh

@@ -51,7 +51,7 @@ fi
 
 $ROOT_PATH/.github/scripts/toolchain/build-gcc.sh
 
-if [[ "$PLATFORM" =~ (mingw|cygwin) ]]; then
+if [[ "$PLATFORM" =~ mingw ]]; then
     $ROOT_PATH/.github/scripts/toolchain/build-mingw.sh
 fi
 if [[ "$PLATFORM" =~ cygwin ]]; then

.github/scripts/config.sh

@@ -12,7 +12,7 @@ GCC_REPO=${GCC_REPO:-Windows-on-ARM-Experiments/gcc-woarm64}
 GCC_BRANCH=${GCC_BRANCH:-woarm64}
 
 MINGW_REPO=${MINGW_REPO:-Windows-on-ARM-Experiments/mingw-woarm64}
-MINGW_BRANCH=${MINGW_BRANCH:-woarm64}
+MINGW_BRANCH=${MINGW_BRANCH:-fix-outline-atomics}
 
 CYGWIN_REPO=${CYGWIN_REPO:-Windows-on-ARM-Experiments/newlib-cygwin}
 CYGWIN_BRANCH=${CYGWIN_BRANCH:-woarm64}

.github/scripts/toolchain/build-mingw.sh

@@ -56,15 +56,23 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$MINGW_BUILD_PATH/Makefile" ]]; then
             ;;
         esac
 
+        case "$ARCH-$PLATFORM" in
+            x86_64-w64-mingw32)
+                LDFLAGS="$LDFLAGS -L$TOOLCHAIN_PATH/lib/gcc/$TARGET/lib"
+            ;;
+        esac
+
         $SOURCE_PATH/mingw/configure \
             --prefix=$TOOLCHAIN_PATH/$TARGET \
             --build=$BUILD \
             --host=$TARGET \
             --enable-static \
             --enable-shared \
+            --with-libraries=all \
             $HOST_OPTIONS \
             $TARGET_OPTIONS \
-            CFLAGS="$CFLAGS"
+            CFLAGS="$CFLAGS" \
+            LDFLAGS="$LDFLAGS"
     echo "::endgroup::"
 fi
 

.github/scripts/toolchain/install-cygwin-headers.sh

@@ -5,7 +5,7 @@ source `dirname ${BASH_SOURCE[0]}`/../config.sh
 CYGWIN_SOURCE_PATH=$SOURCE_PATH/cygwin
 
 echo "::group::Install Cygwin headers"
-    mkdir -p $TOOLCHAIN_PATH/include
+    mkdir -p $TOOLCHAIN_PATH/$TARGET/include
 
     cp -r $CYGWIN_SOURCE_PATH/newlib/libc/include/* $TOOLCHAIN_PATH/$TARGET/include
     cp -r $CYGWIN_SOURCE_PATH/winsup/cygwin/include/* $TOOLCHAIN_PATH/$TARGET/include

.github/workflows/advanced.yml

@@ -18,7 +18,7 @@ on:
       mingw_branch:
         description: 'MinGW branch to build'
         required: false
-        default: 'woarm64'
+        default: 'fix-outline-atomics'
       cygwin_branch:
         description: 'Cygwin branch to build'
         required: false
@@ -75,7 +75,7 @@ env:
   GCC_BRANCH: ${{ inputs.gcc_branch || 'woarm64' }}
 
   MINGW_REPO: Windows-on-ARM-Experiments/mingw-woarm64
-  MINGW_BRANCH: ${{ inputs.mingw_branch || 'woarm64' }}
+  MINGW_BRANCH: ${{ inputs.mingw_branch || 'fix-outline-atomics' }}
 
   CYGWIN_REPO: Windows-on-ARM-Experiments/newlib-cygwin
   CYGWIN_BRANCH: ${{ inputs.cygwin_branch || 'woarm64' }}
@@ -315,7 +315,7 @@ jobs:
           .github/scripts/toolchain/build-gcc.sh
 
       - name: Build MinGW
-        if: ${{ steps.cache-toolchain.outputs.cache-hit != 'true' && matrix.platform != 'pc-linux-gnu' }}
+        if: ${{ steps.cache-toolchain.outputs.cache-hit != 'true' && matrix.platform == 'w64-mingw32' }}
         run: |
           .github/scripts/toolchain/build-mingw.sh
 

.github/workflows/main.yml

@@ -18,11 +18,11 @@ on:
       mingw_branch:
         description: 'Mingw branch to build'
         required: false
-        default: 'woarm64'
+        default: 'fix-outline-atomics'
 env:
   BINUTILS_BRANCH: ${{ inputs.binutils_branch || 'woarm64' }}
   GCC_BRANCH: ${{ inputs.gcc_branch || 'woarm64' }}
-  MINGW_BRANCH: ${{ inputs.mingw_branch || 'woarm64' }}
+  MINGW_BRANCH: ${{ inputs.mingw_branch || 'fix-outline-atomics' }}
 
   BUILD_PATH: ${{ github.workspace }}/build
   CCACHE_DIR_PATH: ${{ github.workspace }}/ccache