diff options
| author | Mike McQuaid | 2014-04-15 13:18:04 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2014-04-23 08:15:30 +0100 |
| commit | 5a7df98afb4a6a3d1c70ba9acf68df14c3ce8b0f (patch) | |
| tree | 00fa684b40e27bd630e20daa41ecab62ab53cf6f | |
| parent | 8723dba421079a546486119a9677e218987ba6a0 (diff) | |
| download | homebrew-5a7df98afb4a6a3d1c70ba9acf68df14c3ce8b0f.tar.bz2 | |
Use gcc instead of apple-gcc42 when needed.
| -rwxr-xr-x | Library/Contributions/cmd/brew-test-bot.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/ghc.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/grass.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/exceptions.rb | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Library/Contributions/cmd/brew-test-bot.rb b/Library/Contributions/cmd/brew-test-bot.rb index a39b096b1..8d0a7d197 100755 --- a/Library/Contributions/cmd/brew-test-bot.rb +++ b/Library/Contributions/cmd/brew-test-bot.rb @@ -278,7 +278,7 @@ class Test CompilerSelector.new(formula_object).compiler rescue CompilerSelectionError => e unless installed_gcc - test "brew install apple-gcc42" + test "brew install gcc" installed_gcc = true retry end diff --git a/Library/Formula/ghc.rb b/Library/Formula/ghc.rb index bf1caf64a..e181600a4 100644 --- a/Library/Formula/ghc.rb +++ b/Library/Formula/ghc.rb @@ -20,7 +20,7 @@ class Ghc < Formula url "http://www.haskell.org/ghc/dist/7.8.1-rc2/ghc-7.8.0.20140228-src.tar.bz2" sha1 "8bd8eb3410a7fccc322c0e23e8045fcb5793ea5a" - depends_on "apple-gcc42" if build.build_32_bit? + depends_on "gcc" if build.build_32_bit? depends_on :macos => :mountain_lion resource "binary" do @@ -54,7 +54,7 @@ class Ghc < Formula stable do # http://hackage.haskell.org/trac/ghc/ticket/6009 depends_on :macos => :snow_leopard - depends_on "apple-gcc42" if MacOS.version >= :mountain_lion + depends_on "gcc" if MacOS.version >= :mountain_lion depends_on "gmp" resource "binary" do diff --git a/Library/Formula/grass.rb b/Library/Formula/grass.rb index aceb272c9..a0a948bcf 100644 --- a/Library/Formula/grass.rb +++ b/Library/Formula/grass.rb @@ -23,7 +23,7 @@ class Grass < Formula option "without-gui", "Build without WxPython interface. Command line tools still available." depends_on :macos => :lion - depends_on 'apple-gcc42' if MacOS.version >= :mountain_lion + depends_on 'gcc' if MacOS.version >= :mountain_lion depends_on "pkg-config" => :build depends_on "gettext" depends_on "readline" diff --git a/Library/Homebrew/exceptions.rb b/Library/Homebrew/exceptions.rb index 43a8c38d6..8c4abc126 100644 --- a/Library/Homebrew/exceptions.rb +++ b/Library/Homebrew/exceptions.rb @@ -224,7 +224,7 @@ class CompilerSelectionError < Homebrew::InstallationError super f, <<-EOS.undent #{f.name} cannot be built with any available compilers. To install this formula, you may need to: - brew install apple-gcc42 + brew install gcc EOS end end |
