admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Cabal: move fails_with to a class method

Browse Source 
Fixes Homebrew/homebrew#39950.
This commit is contained in:
Misty De Meo 2015-05-28 19:30:10 -07:00
parent 102170b957
commit 0abe16673e
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/Homebrew/language/haskell.rb
View File

@ -2,6 +2,17 @@ module Language
module Haskell module Haskell
# module for formulas using cabal-install as build tool # module for formulas using cabal-install as build tool
module Cabal module Cabal
module ClassMethods
def setup_ghc_compilers
# Use llvm-gcc on Lion or below (same compiler used when building GHC).
fails_with(:clang) if MacOS.version <= :lion
end
end
def self.included base
base.extend ClassMethods
end
def cabal_sandbox def cabal_sandbox
pwd = Pathname.pwd pwd = Pathname.pwd
# force cabal to put its stuff here instead of the home directory by # force cabal to put its stuff here instead of the home directory by
@ -11,9 +22,6 @@ module Language
home = ENV["HOME"] home = ENV["HOME"]
ENV["HOME"] = pwd ENV["HOME"] = pwd
# Use llvm-gcc on Lion or below (same compiler used when building GHC).
fails_with(:clang) if MacOS.version <= :lion
# use cabal's sandbox feature if available # use cabal's sandbox feature if available
cabal_version = `cabal --version`[/[0-9.]+/].split('.').collect(&:to_i) cabal_version = `cabal --version`[/[0-9.]+/].split('.').collect(&:to_i)
if (cabal_version <=> [1, 20]) > -1 if (cabal_version <=> [1, 20]) > -1