Set a default target in wrapper scripts and executables

install-wrappers.sh

@@ -23,11 +23,18 @@ esac
 
 if [ -n "$EXEEXT" ]; then
     CLANG_MAJOR=$(basename $(echo $PREFIX/lib/clang/* | awk '{print $NF}') | cut -f 1 -d .)
-    CTW_FLAGS="-municode -DCLANG=\"clang-$CLANG_MAJOR\""
+    CTW_FLAGS="$CTW_FLAGS -municode -DCLANG=\"clang-$CLANG_MAJOR\""
 fi
 
 mkdir -p $PREFIX/bin
 cp wrappers/*-wrapper.sh $PREFIX/bin
+if [ -n "$HOST" ]; then
+    # TODO: If building natively on msys, pick up the default HOST value from there.
+    CTW_FLAGS="$CTW_FLAGS -DDEFAULT_TARGET=\"$HOST\""
+    for i in wrappers/*-wrapper.sh; do
+        cat $i | sed 's/^DEFAULT_TARGET=.*/DEFAULT_TARGET='$HOST/ > $PREFIX/bin/$(basename $i)
+    done
+fi
 $CC wrappers/change-pe-arch.c -o $PREFIX/bin/change-pe-arch$EXEEXT
 $CC wrappers/clang-target-wrapper.c -o $PREFIX/bin/clang-target-wrapper$EXEEXT -O2 -Wl,-s $CTW_FLAGS
 if [ -n "$EXEEXT" ]; then

wrappers/clang-target-wrapper.c

@@ -23,6 +23,9 @@
 #ifndef CLANG
 #define CLANG "clang"
 #endif
+#ifndef DEFAULT_TARGET
+#define DEFAULT_TARGET "x86_64-w64-mingw32"
+#endif
 
 #include <stdio.h>
 #include <string.h>
@@ -114,6 +117,8 @@ int _tmain(int argc, TCHAR* argv[]) {
     if (dash) {
         *dash = '\0';
         exe = dash + 1;
+    } else {
+        target = _T(DEFAULT_TARGET);
     }
     TCHAR *arch = _tcsdup(target);
     dash = _tcschr(arch, '-');

wrappers/clang-target-wrapper.sh

@@ -3,6 +3,10 @@ DIR="$(cd "$(dirname "$0")" && pwd)"
 BASENAME="$(basename "$0")"
 TARGET="${BASENAME%-*}"
 EXE="${BASENAME##*-}"
+DEFAULT_TARGET=x86_64-w64-mingw32
+if [ "$TARGET" = "$BASENAME" ]; then
+    TARGET=$DEFAULT_TARGET
+fi
 ARCH="${TARGET%%-*}"
 
 # Allow setting e.g. CCACHE=1 to wrap all building in ccache.

wrappers/dlltool-wrapper.sh

@@ -5,6 +5,10 @@ export PATH=$DIR:$PATH
 
 BASENAME="$(basename "$0")"
 TARGET="${BASENAME%-*}"
+DEFAULT_TARGET=x86_64-w64-mingw32
+if [ "$TARGET" = "$BASENAME" ]; then
+    TARGET=$DEFAULT_TARGET
+fi
 ARCH="${TARGET%%-*}"
 case $ARCH in
 i686)    M=i386        ;;

wrappers/ld-wrapper.sh

@@ -21,6 +21,10 @@ fi
 
 BASENAME="$(basename "$0")"
 TARGET="${BASENAME%-*}"
+DEFAULT_TARGET=x86_64-w64-mingw32
+if [ "$TARGET" = "$BASENAME" ]; then
+    TARGET=$DEFAULT_TARGET
+fi
 ARCH="${TARGET%%-*}"
 case $ARCH in
 i686)    M=i386pe   ;;

wrappers/objcopy-wrapper.sh

@@ -5,6 +5,10 @@ set -e
 DIR="$(cd "$(dirname "$0")" && pwd)"
 BASENAME="$(basename "$0")"
 TARGET="${BASENAME%-*}"
+DEFAULT_TARGET=x86_64-w64-mingw32
+if [ "$TARGET" = "$BASENAME" ]; then
+    TARGET=$DEFAULT_TARGET
+fi
 EXE="${BASENAME##*-}"
 ARCH="${TARGET%%-*}"
 

wrappers/windres-wrapper.sh

@@ -88,6 +88,10 @@ CODEPAGE=1252
 CPP_OPTIONS=
 BASENAME="$(basename "$0")"
 TARGET="${BASENAME%-*}"
+DEFAULT_TARGET=x86_64-w64-mingw32
+if [ "$TARGET" = "$BASENAME" ]; then
+    TARGET=$DEFAULT_TARGET
+fi
 PROG="$BASENAME"
 
 while [ $# != 0 ]; do