Permalink
Browse files

Improve robustness of Mac OS X build of prebuilt installers.

  • Loading branch information...
1 parent 27834d8 commit 3243481a96a699d2f96884c30c2e84c6c4141cd4 @feeley feeley committed Jan 28, 2012
Showing with 5 additions and 5 deletions.
  1. +2 −2 include/stamp.h
  2. +1 −1 prebuilt/macosx/build
  3. +2 −2 prebuilt/macosx/makefile.in
View
@@ -2,5 +2,5 @@
* Time stamp of last source code repository commit.
*/
-#define ___STAMP_YMD 20120126
-#define ___STAMP_HMS 201428
+#define ___STAMP_YMD 20120128
+#define ___STAMP_HMS 3604
View
@@ -49,7 +49,7 @@ for VARIANT in intel32 intel64; do
SYSROOT="/Developer/SDKs/MacOSX10.6.sdk"
- CFLAGS="-isysroot $SYSROOT $CONFIG_ARCH" LDFLAGS="-mmacosx-version-min=10.5 -Wl,-syslibroot,$SYSROOT $CONFIG_ARCH" ./configure "$CONFIG_BUILD" --prefix="$INSTALL_PREFIX" --enable-multiple-versions --enable-symlinks --enable-single-host # --enable-gcc-opts
+ CC="gcc" CFLAGS="-isysroot $SYSROOT $CONFIG_ARCH" LDFLAGS="-mmacosx-version-min=10.5 -Wl,-syslibroot,$SYSROOT $CONFIG_ARCH" ./configure "$CONFIG_BUILD" --prefix="$INSTALL_PREFIX" --enable-multiple-versions --enable-symlinks --enable-single-host # --enable-gcc-opts
cd "$herefromroot"
@@ -1,6 +1,6 @@
# makefile for Gambit-C build on MacOS X.
-# Copyright (c) 1994-2011 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
herefromroot = prebuilt/macosx
rootfromhere = ../..
@@ -80,7 +80,7 @@ all-pre:
all-post:
prebuilt:
- PATH="$(rootfromhere)/gsi:$$PATH" ../remote-connect macosx "" "(define tmpdir \"gambtmp1\")(define gambc-dist \"$(PACKAGE_TARNAME)\")(define timeout 600)(ssh timeout (string-append \"rm -rf \" tmpdir \";mkdir \" tmpdir \";\"))(scp-to timeout (string-append \"$(rootfromhere)/\" gambc-dist \".tgz\") (string-append tmpdir \"/.\"))(ssh timeout (string-append \"cd \" tmpdir \";tar zxf \" gambc-dist \".tgz;cd \" gambc-dist \";sudo $(herefromroot)/build\"))(scp-from timeout (string-append tmpdir \"/\" gambc-dist \"/$(PACKAGE_TARNAME)-*\") \"$(rootfromhere)\")"
+ PATH="$(rootfromhere)/gsi:$$PATH" ../remote-connect macosx "" "(define tmpdir \"gambtmp1\")(define gambc-dist \"$(PACKAGE_TARNAME)\")(define timeout 600)(ssh timeout (string-append \"sudo rm -rf \" tmpdir \";mkdir \" tmpdir \";\"))(scp-to timeout (string-append \"$(rootfromhere)/\" gambc-dist \".tgz\") (string-append tmpdir \"/.\"))(ssh timeout (string-append \"cd \" tmpdir \";tar zxf \" gambc-dist \".tgz;cd \" gambc-dist \";sudo $(herefromroot)/build\"))(scp-from timeout (string-append tmpdir \"/\" gambc-dist \"/$(PACKAGE_TARNAME)-*\") \"$(rootfromhere)\")"
install-pre:

0 comments on commit 3243481

Please sign in to comment.