diff options
| author | Tim King <taking@cs.nyu.edu> | 2015-12-01 20:54:15 -0800 |
|---|---|---|
| committer | Tim King <taking@cs.nyu.edu> | 2015-12-01 20:54:15 -0800 |
| commit | a39d025ce314d7f191f72258fad00ca19e134b5b (patch) | |
| tree | de88edf19eab999bc2d229bdb9becae0c878e12c | |
| parent | 201ae337e8e1531d1ae68a0ae536e34850edecd3 (diff) | |
| parent | f84bc2f51a1a81b7c7c14f1ed0a2d56b4d70fa40 (diff) | |
Merge pull request #79 from CVC4/fix-mac-build-script
Adds required steps to contrib/mac-build.
| -rwxr-xr-x | contrib/get-antlr-3.4 | 14 | ||||
| -rwxr-xr-x | contrib/mac-build | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/contrib/get-antlr-3.4 b/contrib/get-antlr-3.4 index 436ef6a8d..6a36681cb 100755 --- a/contrib/get-antlr-3.4 +++ b/contrib/get-antlr-3.4 @@ -27,11 +27,17 @@ function webget { if [ -z "${MACHINE_TYPE}" ]; then if ! [ -e config/config.guess ]; then - echo "$(basename $0): I need the file config/config.guess to tell MACHINE_TYPE" >&2 - echo "Try running ./autogen.sh, or set the MACHINE_TYPE environment variable." >&2 - exit 1 + # Attempt to download once + webget 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD' config/config.guess + if [ -e config/config.guess ]; then + chmod +x config/config.guess + else + echo "$(basename $0): I need the file config/config.guess to tell MACHINE_TYPE" >&2 + echo "Try running ./autogen.sh, or set the MACHINE_TYPE environment variable" >&2 + echo "(e.g., \"export MACHINE_TYPE=x86_64\")." >&2 + exit 1 + fi fi - # get first nibble from config.guess (x86_64, i686, ...) MACHINE_TYPE=`config/config.guess | sed 's,-.*,,'` fi diff --git a/contrib/mac-build b/contrib/mac-build index 2501b667d..e45cd0fad 100755 --- a/contrib/mac-build +++ b/contrib/mac-build @@ -5,7 +5,7 @@ # Tue, 25 Sep 2012 15:44:27 -0400 # -macports_prereq="boost gmp gtime readline" +macports_prereq="autoconf automake boost gmp gtime libtool readline" export PATH="/opt/local/bin:$PATH" |