diff options
| author | Adam Vandenberg | 2013-06-21 17:20:59 -0700 |
|---|---|---|
| committer | Adam Vandenberg | 2013-06-21 17:20:59 -0700 |
| commit | 5485e9d70a19525cb7412bf7be1e26b0774717e5 (patch) | |
| tree | 1566189455d00d143413612ced7f3bb8b23016d9 /Library/Formula | |
| parent | d3123c90ea3074e7a328a82d3ac2ceaef0492c26 (diff) | |
| download | homebrew-5485e9d70a19525cb7412bf7be1e26b0774717e5.tar.bz2 | |
GHC: remove duplicate j1 blocks
j1 is specified before each make install, so just put it
once at the top
Closes #20450.
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/ghc.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Library/Formula/ghc.rb b/Library/Formula/ghc.rb index f223731fd..daf23b0c2 100644 --- a/Library/Formula/ghc.rb +++ b/Library/Formula/ghc.rb @@ -43,6 +43,8 @@ class Ghc < Formula end def install + ENV.j1 # Fixes an intermittent race condition + # Move the main tarball contents into a subdirectory (buildpath+'Ghcsource').install Dir['*'] @@ -52,7 +54,7 @@ class Ghc < Formula Ghcbinary.new.brew do system "./configure", "--prefix=#{subprefix}" # Temporary j1 to stop an intermittent race condition - system 'make', '-j1', 'install' + system 'make install' ENV.prepend 'PATH', subprefix/'bin', ':' end @@ -70,7 +72,6 @@ class Ghc < Formula system "./configure", "--prefix=#{prefix}", "--build=#{arch}-apple-darwin" - ENV.j1 # Fixes an intermittent race condition system 'make' if build.include? 'tests' Ghctestsuite.new.brew do @@ -84,8 +85,7 @@ class Ghc < Formula end end end - ENV.j1 # Fixes an intermittent race condition - system 'make', 'install' + system 'make install' end end |
