Changes needed to build Cygwin toolchain inside Cygwin shell

Author: Blackhex

.gitattributes

@@ -1 +1,2 @@
 *.sh text eol=lf
+apt-cyg text eol=lf

.github/scripts/binutils/build.sh

@@ -54,7 +54,9 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$BINUTILS_BUILD_PATH/Makefile" ]]; then
 fi
 
 echo "::group::Build binutils"
-    make $BUILD_MAKE_OPTIONS
+    which make
+    make --version
+    make
 echo "::endgroup::"
 
 if [[ "$RUN_INSTALL" = 1 ]]; then

.github/scripts/build.sh

@@ -44,8 +44,11 @@ fi
 if [[ "$PLATFORM" =~ mingw ]]; then
     $ROOT_PATH/.github/scripts/toolchain/build-mingw-winpthreads.sh
 fi
+
 if [[ "$PLATFORM" =~ cygwin ]]; then
-    $ROOT_PATH/.github/scripts/toolchain/build-cocom.sh
+    if [[ "$CYGWIN" = 0 ]]; then
+        $ROOT_PATH/.github/scripts/toolchain/build-cocom.sh
+    fi
     $ROOT_PATH/.github/scripts/toolchain/build-cygwin.sh 1
 fi
 

.github/scripts/config.sh

@@ -15,7 +15,7 @@ MINGW_REPO=${MINGW_REPO:-Windows-on-ARM-Experiments/mingw-woarm64}
 MINGW_BRANCH=${MINGW_BRANCH:-woarm64}
 
 CYGWIN_REPO=${CYGWIN_REPO:-Windows-on-ARM-Experiments/newlib-cygwin}
-CYGWIN_BRANCH=${CYGWIN_BRANCH:-woarm64}
+CYGWIN_BRANCH=${CYGWIN_BRANCH:-native-cygwin}
 
 CYGWIN_PACKAGES_REPO=${CYGWIN_PACKAGES_REPO:-Windows-on-ARM-Experiments/cygwin-packages}
 CYGWIN_PACKAGES_BRANCH=${CYGWIN_PACKAGES_BRANCH:-main}
@@ -32,17 +32,18 @@ CYGWIN_PACKAGES_BASE_BRANCH=main
 COCOM_BASE_BRANCH=master
 
 ARCH=${ARCH:-aarch64}
-PLATFORM=${PLATFORM:-w64-mingw32}
+PLATFORM=${PLATFORM:-pc-cygwin}
 if [[ "$PLATFORM" =~ (mingw|cygwin) ]]; then
     CRT=${CRT:-msvcrt}
 else
     CRT=${CRT:-libc}
 fi
 
-PROCESSOR=$(uname --processor)
-BUILD=${BUILD:-$PROCESSOR-pc-linux-gnu}
-HOST=${HOST:-$PROCESSOR-pc-linux-gnu}
+PROCESSOR=x86_64
+BUILD=${BUILD:-$PROCESSOR-pc-cygwin}
+HOST=${HOST:-$PROCESSOR-pc-cygwin}
 TARGET=$ARCH-$PLATFORM
+CYGWIN=`if uname | grep -qi cygwin; then echo 1; else echo 0; fi`
 TOOLCHAIN_NAME=${TOOLCHAIN_NAME:-$ARCH-$PLATFORM-$CRT}
 
 if [[ ("$PLATFORM" =~ (mingw|cygwin) && ! ("$CRT" =~ (msvcrt|ucrt))) ||

.github/scripts/enable-ccache.sh

@@ -2,6 +2,7 @@
 
 source `dirname ${BASH_SOURCE[0]}`/config.sh
 
+mkdir -p $CCACHE_LIB_DIR
 mkdir -p $TOOLCHAIN_CCACHE_LIB_DIR
 
 echo "::group::Add $TARGET toolchain to ccache"

.github/scripts/install-dependencies.sh

@@ -3,28 +3,58 @@
 source `dirname ${BASH_SOURCE[0]}`/config.sh
 
 echo "::group::Install Dependencies"
-    sudo apt update
-    sudo apt install -y \
-      autoconf \
-      autogen \
-      automake \
-      autotools-dev \
-      binutils-for-build \
-      bison \
-      build-essential \
-      busybox \
-      ccache \
-      dejagnu \
-      docbook2x \
-      flex \
-      gdc \
-      jq \
-      libc6-dev-arm64-cross \
-      libc6-dev-amd64-cross \
-      texinfo \
-      xmlto \
-      zlib1g-dev \
-      zstd
+    if [[ "$CYGWIN" = 1 ]]; then
+        # wget needs to be already installed
+        $ROOT_PATH/tools/apt-cyg update
+        $ROOT_PATH/tools/apt-cyg install \
+            autoconf \
+            autogen \
+            automake \
+            binutils \
+            bison \
+            busybox \
+            ccache \
+            cygutils-extra \
+            dejagnu \
+            docbook2X \
+            flex \
+            gcc-core \
+            gcc-g++ \
+            gcc-gdc \
+            jq \
+            make \
+            mingw64-x86_64-gcc-core \
+            mingw64-x86_64-gcc-g++ \
+            mingw64-x86_64-zlib \
+            patch \
+            texinfo \
+            xmlto \
+            zlib-devel \
+            zstd
+    else
+        sudo apt update
+        sudo apt install -y \
+            autoconf \
+            autogen \
+            automake \
+            autotools-dev \
+            binutils-for-build \
+            bison \
+            build-essential \
+            busybox \
+            ccache \
+            dejagnu \
+            docbook2x \
+            flex \
+            gdc \
+            jq \
+            libc6-dev-arm64-cross \
+            libc6-dev-amd64-cross \
+            texinfo \
+            xmlto \
+            zlib1g-dev \
+            zstd
+    fi
 echo "::endgroup::"
 
 echo 'Success!'

.github/scripts/strip-host-binaries.sh

@@ -6,7 +6,7 @@ echo "::group::Strip host binaries"
     find "$TOOLCHAIN_PATH" \
         -type f -exec sh -c 'file -b "$1" | grep -q "ELF"' _ {} \; \
         -printf 'Stripping %p\n' \
-        -exec strip --strip-unneeded {} \;
+        -exec $HOST-strip --strip-unneeded {} \;
 echo "::endgroup::"
 
 echo 'Success!'

.github/scripts/strip-target-binaries.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+source `dirname ${BASH_SOURCE[0]}`/config.sh
+
+echo "::group::Strip target binaries"
+    find "$TOOLCHAIN_PATH" \
+        -type f -exec sh -c 'file -b "$1" | grep -q "PE32+"' _ {} \; \
+        -printf 'Stripping %p\n' \
+        -exec $TARGET-strip --strip-unneeded {} \;
+echo "::endgroup::"
+
+echo 'Success!'

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

@@ -13,6 +13,11 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$CYGWIN_BUILD_PATH/Makefile" ]]; then
     echo "::group::Configure Cygwin"
         rm -rf $CYGWIN_BUILD_PATH/*
 
+        if [[ "$BUILD" != "$TARGET" ]] && [[ "$CYGWIN" = 0 ]]; then
+            BUILD_OPTIONS="$BUILD_OPTIONS \
+                --with-cross-bootstrap"
+        fi
+
         if [ "$DEBUG" = 1 ] ; then
             HOST_OPTIONS="$HOST_OPTIONS \
                 --enable-debug \
@@ -23,7 +28,8 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$CYGWIN_BUILD_PATH/Makefile" ]]; then
         if [[ "$STAGE" = "1" ]]; then
             (cd $CYGWIN_SOURCE_PATH && patch -p1 -i $PATCHES_PATH/cygwin/0001-fix-autogen.patch)
             HOST_OPTIONS="$HOST_OPTIONS \
-                --disable-cygserver"
+                --disable-cygserver \
+                --disable-utils"
         else
             HOST_OPTIONS="$HOST_OPTIONS \
                 --enable-cygserver"
@@ -43,7 +49,7 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$CYGWIN_BUILD_PATH/Makefile" ]]; then
             --disable-dumper \
             --with-sysroot=$TOOLCHAIN_PATH \
             --with-build-sysroot=$TOOLCHAIN_PATH \
-            --with-cross-bootstrap \
+            $BUILD_OPTIONS \
             $HOST_OPTIONS \
             $TARGET_OPTIONS
     echo "::endgroup::"

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

@@ -109,7 +109,7 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$GCC_BUILD_PATH/Makefile" ]]; then
             --host=$HOST \
             --target=$TARGET \
             --enable-static \
-            --enable-languages=c,c++,d,fortran,lto,m2,objc,obj-c++ \
+            --enable-languages=c,c++,fortran,lto,m2,objc,obj-c++ \
             --disable-bootstrap \
             --disable-multilib \
             --with-gnu-as \