Build for x86_64-w64-mingw32 target

Windows-on-ARM-Experiments · Nov 1, 2023 · 7e22ae8 · 7e22ae8
1 parent 217e85e
commit 7e22ae8
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 21 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -25,8 +25,15 @@ env:
 
 jobs:
   run-script:
+    strategy:
+      matrix:
+        target: [aarch64, x86_64]
+
     runs-on: ubuntu-latest
 
+    env:
+      TARGET_ARCH: ${{ matrix.target }}
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
-build-aarch64-w64-mingw32/
+.vscode/
+build-*/
 code/
 downloads/
 *.exe
@@ -9,4 +10,4 @@ downloads/
 *.pdb
 *.dump
 *.log
-*.a
+*.a
diff --git a/build.sh b/build.sh
@@ -23,13 +23,13 @@ MINGW_REPO=https://github.com/ZacWalk/mingw-woarm64.git
 MINGW_BRANCH=${MINGW_BRANCH:-woarm64}
 MINGW_VERSION=mingw-w64-master
 
-# TARGET_ARCH=x86_64
-TARGET_ARCH=aarch64
+BUILD=x86_64-linux-gnu
+TARGET_ARCH=${TARGET_ARCH:-aarch64}
+TARGET=$TARGET_ARCH-w64-mingw32
 INSTALL_PATH=~/cross
 RUN_DOWNLOAD=1
 RUN_CONFIG=1
 MSYS2_CONFIG=1
-TARGET=$TARGET_ARCH-w64-mingw32
 # TARGET=$TARGET_ARCH-pc-cygwin
 BUILD_DIR=build-$TARGET
 PARALLEL_MAKE=-j6
@@ -42,6 +42,15 @@ WGET_OPTIONS="-nc -P downloads"
 
 export PATH=$INSTALL_PATH/bin:$PATH
 
+case "$TARGET" in
+    x86_64*)
+        MINGW_CONF="--disable-lib32 --enable-lib64 --disable-libarm32 --disable-libarm64"
+    ;;
+    aarch64*)
+        MINGW_CONF="--disable-lib32 --disable-lib64 --disable-libarm32 --enable-libarm64"
+    ;;
+esac
+
 make_folders()
 {
     mkdir -p code
@@ -50,7 +59,6 @@ make_folders()
     mkdir -p $BUILD_DIR/gcc
     mkdir -p $BUILD_DIR/mingw-headers
     mkdir -p $BUILD_DIR/mingw
-    mkdir -p $BUILD_DIR/mingw
 }
 
 download_sources()
@@ -88,7 +96,9 @@ config_binutils()
     echo "==== config binutils"
     cd $BUILD_DIR/binutils
     ../../code/$BINUTILS_VERSION/configure \
-        --prefix=$INSTALL_PATH --target=$TARGET 
+        --prefix=$INSTALL_PATH \
+        --build=$BUILD \
+        --target=$TARGET 
     cd ../..
 }
 
@@ -110,6 +120,7 @@ config_gcc_compiler()
         # REMOVED --with-{gmp,mpfr,mpc,isl}=/usr
         ../../code/$GCC_VERSION/configure \
             --prefix=$INSTALL_PATH \
+            --build=$BUILD \
             --target=$TARGET \
             --enable-languages=c,lto,c++,fortran \
             --enable-shared \
@@ -140,7 +151,9 @@ config_gcc_compiler()
             --with-gnu-ld
     else 
         ../../code/$GCC_VERSION/configure \
-            --prefix=$INSTALL_PATH --target=$TARGET \
+            --prefix=$INSTALL_PATH \
+            --build=$BUILD \
+            --target=$TARGET \
             --enable-languages=c,c++,fortran \
             --disable-libunwind-exceptions \
             --enable-seh-exceptions \
@@ -164,6 +177,7 @@ config_mingw_headers()
     cd $BUILD_DIR/mingw-headers
     ../../code/$MINGW_VERSION/mingw-w64-headers/configure \
         --prefix=$INSTALL_PATH/$TARGET \
+        --build=$BUILD \
         --host=$TARGET \
         --with-default-msvcrt=msvcrt
     cd ../..
@@ -185,16 +199,12 @@ config_mingw_crt()
     echo "==== config mingw crt"
     cd $BUILD_DIR/mingw
     ../../code/$MINGW_VERSION/mingw-w64-crt/configure \
-        --build=x86_64-linux-gnu \
-        --with-sysroot=$INSTALL_PATH \
         --prefix=$INSTALL_PATH/$TARGET \
+        --build=$BUILD \
         --host=$TARGET \
-        --enable-libarm64 \
-        --disable-lib32 \
-        --disable-lib64 \
-        --disable-libarm32 \
-        --disable-shared \
-        --with-default-msvcrt=msvcrt
+        --with-sysroot=$INSTALL_PATH \
+        --with-default-msvcrt=msvcrt \
+        $MING_CONF
     cd ../..
 }
 
@@ -213,14 +223,11 @@ config_mingw_libs()
     cd $BUILD_DIR/mingw
     ../../code/$MINGW_VERSION/configure \
         --prefix=$INSTALL_PATH/$TARGET \
+        --build=$BUILD \
         --host=$TARGET \
-        --enable-libarm64 \
-        --disable-lib32 \
-        --disable-lib64 \
-        --disable-libarm32 \
-        --disable-shared \
         --with-libraries=libmangle,pseh,winpthreads \
         --with-default-msvcrt=msvcrt
+        $MING_CONF
     cd ../..
 }