summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2011-12-18 05:15:53 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2011-12-18 05:15:53 -0600
commit96515464af79fa10081c39a87fa4b0b19df53eda (patch)
treee0c0dee6379194279c453a6a1148a52aad355b39 /bootstrap
parentb23f2d78c4d3ca9a79027c6251f3933a85f88053 (diff)
force the use of gcc on cygwin for concat-deps.c
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap8
1 files changed, 6 insertions, 2 deletions
diff --git a/bootstrap b/bootstrap
index da1192c48882..26ade9a9ce89 100755
--- a/bootstrap
+++ b/bootstrap
@@ -76,8 +76,12 @@ fi
# build concat-deps
echo "building concat-deps"
-$CC_FOR_BUILD -O2 "$SOLARENV/bin/concat-deps.c" -o "$SOLARENV/bin/concat-deps" || exit
-
+if [ "$COM_FOR_BUILD" = "MSC" ] ; then
+ # on cygwin force the use of gcc
+ gcc -O2 "$SOLARENV/bin/concat-deps.c" -o "$SOLARENV/bin/concat-deps" || exit
+else
+ $CC_FOR_BUILD -O2 "$SOLARENV/bin/concat-deps.c" -o "$SOLARENV/bin/concat-deps" || exit
+fi
#make sure build.pl is executable
chmod +x "$SRC_ROOT/solenv/bin/build.pl"