Skip to content
Snippets Groups Projects
Commit 22afb1cc authored by Camillo Lugaresi's avatar Camillo Lugaresi Committed by Mike McQuaid
Browse files

make fails_with_llvm work when cc is llvm-gcc


Closes Homebrew/homebrew#4693.

Signed-off-by: default avatarMike McQuaid <mike@mikemcquaid.com>
parent ec0ae5ee
No related branches found
No related tags found
No related merge requests found
......@@ -14,6 +14,10 @@ def dump_build_env env
Homebrew.dump_build_env env
end
def default_cc
MacOS.default_cc
end
def gcc_42_build
MacOS.gcc_42_build_version
end
......
......@@ -265,7 +265,10 @@ class Formula
end
def fails_with_llvm msg="", data=nil
return unless (ENV['HOMEBREW_USE_LLVM'] or ARGV.include? '--use-llvm')
unless (ENV['HOMEBREW_USE_LLVM'] or ARGV.include? '--use-llvm')
ENV.gcc_4_2 if default_cc =~ /llvm/
return
end
build = data.delete :build rescue nil
msg = "(No specific reason was given)" if msg.empty?
......
require 'pathname'
class Tty
class <<self
def blue; bold 34; end
......@@ -208,6 +210,11 @@ def nostdout
end
module MacOS extend self
def default_cc
Pathname.new("/usr/bin/cc").realpath.basename.to_s
end
def gcc_42_build_version
`/usr/bin/gcc-4.2 -v 2>&1` =~ /build (\d{4,})/
if $1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment