aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/compilers.rb
diff options
context:
space:
mode:
authorJack Nagel2013-03-11 22:54:15 -0500
committerJack Nagel2013-03-12 13:55:15 -0500
commit5ddd40b8449efc82b831ff62151d5012f6e05ac0 (patch)
tree8d782dc9569c8fc25b8f5da6f97c9fddd12a444e /Library/Homebrew/compilers.rb
parent18fd4f122d41aca306ea17d86feacbbbf44ad05f (diff)
downloadhomebrew-5ddd40b8449efc82b831ff62151d5012f6e05ac0.tar.bz2
Switch compilers when no build is specified
Given the current state of OS X compilers, the original fails_with behavior is becoming less useful, mostly resulting in build failures each time the compiler is updated. So make the following changes: When a build is specified, we retain the old behavior: switch compilers if the available compiler is <= the build, don't switch if it is > the build. When no build is specified, unconditionally switch compilers, and don't output the advice message. This allows us to mark formulae as perpetually failing, avoiding the need to update formulae each time a new compiler build is made available. As a bonus, this makes the logic much easier to reason about. Closes #18175.
Diffstat (limited to 'Library/Homebrew/compilers.rb')
-rw-r--r--Library/Homebrew/compilers.rb37
1 files changed, 2 insertions, 35 deletions
diff --git a/Library/Homebrew/compilers.rb b/Library/Homebrew/compilers.rb
index ae3d7590e..f9ed8bcde 100644
--- a/Library/Homebrew/compilers.rb
+++ b/Library/Homebrew/compilers.rb
@@ -68,6 +68,7 @@ class CompilerFailure
def initialize compiler, &block
@compiler = compiler
instance_eval(&block) if block_given?
+ @build ||= 9999
end
def build val=nil
@@ -100,8 +101,7 @@ class CompilerSelector
# the failing build is >= the currently installed version of foo.
@compilers = @compilers.reject do |cc|
failure = @f.fails_with? cc
- next unless failure
- failure.build >= cc.build or not ARGV.homebrew_developer?
+ failure && failure.build >= cc.build
end
return if @compilers.empty? or @compilers.include? ENV.compiler
@@ -126,37 +126,4 @@ class CompilerSelector
end
end
end
-
- def advise
- failure = @f.fails_with? @old_compiler
- return unless failure
-
- # If we're still using the original ENV.compiler, then the formula did not
- # declare a specific failing build, so we continue and print some advice.
- # Otherwise, tell the user that we're switching compilers.
- if @old_compiler == ENV.compiler
- cc = Compiler.new(ENV.compiler)
- subject = "#{@f.name}-#{@f.version}: builds with #{NAMES[cc.name]}-#{cc.build}-#{MACOS_VERSION}"
- warning = "Using #{NAMES[cc.name]}, but this formula is reported to fail with #{NAMES[cc.name]}."
- warning += "\n\n#{failure.cause.strip}\n" unless failure.cause.nil?
- warning += <<-EOS.undent
-
- We are continuing anyway so if the build succeeds, please open a ticket with
- the subject
-
- #{subject}
-
- so that we can update the formula accordingly. Thanks!
- EOS
-
- viable = @compilers.reject { |c| @f.fails_with? c }
- unless viable.empty?
- warning += "\nIf it fails you can use "
- options = viable.map { |c| "--use-#{c.name}" }
- warning += "#{options*' or '} to try a different compiler."
- end
-
- opoo warning
- end
- end
end