Share one include directory between all archs

build-libcxx.sh

@@ -151,4 +151,4 @@ for arch in $ARCHS; do
 done
 cd ..
 
-ln -sf ../$(echo $ARCHS | awk '{print $1}')-w64-mingw32/include/c++ $PREFIX/include/c++
+ln -sf ../generic-w64-mingw32/include/c++ $PREFIX/include/c++

build-mingw-w64.sh

@@ -25,15 +25,16 @@ if [ -n "$SYNC" ] || [ -n "$CHECKOUT" ]; then
 fi
 
 cd mingw-w64-headers
-for arch in $ARCHS; do
+mkdir -p build
-    mkdir -p build-$arch
+cd build
-    cd build-$arch
+../configure --prefix=$PREFIX/generic-w64-mingw32 \
-    ../configure --host=$arch-w64-mingw32 --prefix=$PREFIX/$arch-w64-mingw32 \
     --enable-secure-api --enable-idl --with-default-win32-winnt=0x600 --with-default-msvcrt=ucrtbase INSTALL="install -C"
-    make install
+make install
-    cd ..
+cd ../..
+for arch in $ARCHS; do
+    mkdir -p $PREFIX/$arch-w64-mingw32
+    ln -sf ../generic-w64-mingw32/include $PREFIX/$arch-w64-mingw32/include
 done
-cd ..
 
 cd mingw-w64-crt
 for arch in $ARCHS; do