diff options
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/ghc.rb | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/Library/Formula/ghc.rb b/Library/Formula/ghc.rb index 47ceb4061..174967928 100644 --- a/Library/Formula/ghc.rb +++ b/Library/Formula/ghc.rb @@ -15,7 +15,7 @@ end class Ghc < Formula homepage 'http://haskell.org/ghc/' - if ARGV.include? '--64bit' + if Hardware.is_64_bit? and not ARGV.build_32_bit? url "http://www.haskell.org/ghc/dist/7.0.4/ghc-7.0.4-x86_64-apple-darwin.tar.bz2" md5 'af89d3d2ca6e9b23384baacb7d8161dd' else @@ -24,7 +24,7 @@ class Ghc < Formula end devel do - if ARGV.include? '--64bit' + if Hardware.is_64_bit? and not ARGV.build_32_bit? url "http://www.haskell.org/ghc/dist/7.4.1/ghc-7.4.1-x86_64-apple-darwin.tar.bz2" md5 '04a572f72c25e9d8fcbd7e9363d276bf' else @@ -48,30 +48,19 @@ class Ghc < Formula end def options - [['--64bit', 'Install 64-bit version of GHC (experimental).']] + [['--32-bit', 'Build 32-bit only.']] end def install if ARGV.build_devel? opoo "The current version of haskell-platform will NOT work with this version of GHC!" end - if ARGV.include? '--64bit' - if Hardware.is_64_bit? - opoo "The x86_64 version is experimental!" - else - onoe "The x86_64 version is only for 64-bit hardware." - exit 1 - end - end system "./configure --prefix=#{prefix}" system "make install" end def caveats; <<-EOS.undent - The 32-bit version of GHC is installed by default, as the x84_64 version is - labelled experimental. Override with `--64bit`. - This brew is for GHC only; you might also be interested in haskell-platform. EOS end |