- Use `gcc' instead of `apple-gcc42'.

[chise/chise-base.git] / bootstrap.homebrew

diff --git a/bootstrap.homebrew b/bootstrap.homebrew
index d99212f..041fc8e 100755 (executable)
--- a/bootstrap.homebrew
+++ b/bootstrap.homebrew
@@ -3,9 +3,14 @@
 brew update
 brew upgrade
 
-brew install https://raw.github.com/Homebrew/homebrew-dupes/master/gcc.rb \
-       --use-llvm
-export IMAKECPP=/usr/local/bin/cpp-4.7
+brew_prefix=`brew --prefix`
+
+#brew install https://raw.github.com/Homebrew/homebrew-dupes/master/gcc.rb \
+#      --use-llvm
+#brew install apple-gcc42
+#export IMAKECPP=/usr/local/bin/cpp-4.2
+brew install gcc
+export IMAKECPP=${brew_prefix}/bin/cpp
 
 brew -v install libtiff
 brew -v install openjpeg
@@ -13,8 +18,6 @@ brew -v install berkeley-db
 brew -v install xaw3d
 brew -v install gettext
 
-brew_prefix=`brew --prefix`
-
 if [ -f /Library/LaunchDaemons/homebrew.mxcl.canna.plist ]
 then
     sudo launchctl unload -w /Library/LaunchDaemons/homebrew.mxcl.canna.plist
@@ -24,10 +27,9 @@ then
     sudo ${brew_prefix}/sbin/cannakill
 fi
 
-(cd ${brew_prefix}; git pull https://github.com/chise/homebrew/)
-
+brew tap chise/misc
 brew -v install canna
-brew upgrade
+
 
 sudo sh -c "sed 's/rc\.canna/rc.canna-root/' \
     < ${brew_prefix}`ls -l ${brew_prefix}/sbin/cannaserver \
@@ -38,7 +40,7 @@ sudo launchctl load -w /Library/LaunchDaemons/homebrew.mxcl.canna.plist
 
 brew -v install wget
 
-./configure \
+CC=${brew_prefix}/bin/gcc ./configure \
     --with-site-includes=/usr/X11/include \
     --with-site-libraries=/usr/X11/lib \
     --with-canna