[Libreoffice-commits] .: bootstrap

[Norbert Thiebaud]

 bootstrap |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 96515464af79fa10081c39a87fa4b0b19df53eda
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Dec 18 05:15:53 2011 -0600

    force the use of gcc on cygwin for concat-deps.c

diff --git a/bootstrap b/bootstrap
index da1192c..26ade9a 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"