summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@secunet.com>2012-12-06 12:14:49 +0100
committerStefan Reinauer <stefan.reinauer@coreboot.org>2012-12-06 23:18:55 +0100
commitfecd26f208cfa4d90748d32dc35d34e5e9a8bda4 (patch)
treef0355b30dc9b5e7bfbaf8a474fbfd7c5e7d48bac
parent399486e8fb8f5b402f1833e496dbed11aa0ac669 (diff)
crossgcc: Generalize matching for the mingw case
With this change, i686-pc-mingw32 is acceptable, too. Change-Id: I924f7ece84e77dc751e5e0318bac1ebc72d39d21 Signed-off-by: Patrick Georgi <patrick.georgi@secunet.com> Reviewed-on: http://review.coreboot.org/1972 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rwxr-xr-xutil/crossgcc/buildgcc10
1 files changed, 5 insertions, 5 deletions
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 4424a4d05f..6d3be970a0 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -238,7 +238,7 @@ if [ $SKIPPYTHON -eq 1 ]; then
fi
MINGW_ARCHIVES=""
-if [ "$TARGETARCH" = "i386-mingw32" ]; then
+if [ "`echo $TARGETARCH | grep -c -- -mingw32`" -gt 0 ]; then
MINGW_ARCHIVES="$W32API_ARCHIVE $MINGWRT_ARCHIVE"
fi
@@ -285,7 +285,7 @@ printf "Downloaded tar balls ... "
printf "${green}ok${NC}\n"
MINGW_PACKAGES=""
-if [ "$TARGETARCH" = "i386-mingw32" ]; then
+if [ "`echo $TARGETARCH | grep -c -- -mingw32`" -gt 0 ]; then
MINGW_PACKAGES="W32API MINGWRT"
fi
@@ -315,10 +315,10 @@ done
printf "Unpacked and patched ... "
printf "${green}ok${NC}\n"
-if [ "$TARGETARCH" = "i386-mingw32" ]; then
- mkdir -p $TARGETDIR/i386-mingw32/sys-include
+if [ "`echo $TARGETARCH | grep -c -- -mingw32`" -gt 0 ]; then
+ mkdir -p $TARGETDIR/$TARGETARCH/sys-include
mv $MINGWRT_DIR/include/* $W32API_DIR/include/* \
- $TARGETDIR/i386-mingw32/sys-include
+ $TARGETDIR/$TARGETARCH/sys-include
fi
CC=cc