diff options
| author | Mike McQuaid | 2016-09-24 20:40:00 +0100 |
|---|---|---|
| committer | GitHub | 2016-09-24 20:40:00 +0100 |
| commit | 232078df57418004bb9bf7abef877e734fcf7005 (patch) | |
| tree | 7e973cb6dd4eb5d4f45252cc02cf56c131cf25e0 /Library/Homebrew/extend | |
| parent | 1e6e2d7d3905c93c0c0358e1600c04e784f4a49c (diff) | |
| parent | 6c6a4c9fa771930c882ab7819e027031fb33b018 (diff) | |
| download | brew-232078df57418004bb9bf7abef877e734fcf7005.tar.bz2 | |
Merge pull request #1123 from reitermarkus/rubocop
RuboCop: Style/AccessorMethodName
Diffstat (limited to 'Library/Homebrew/extend')
| -rw-r--r-- | Library/Homebrew/extend/ARGV.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/extend/ENV/std.rb | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb index ecd50ce06..c217ed8a5 100644 --- a/Library/Homebrew/extend/ARGV.rb +++ b/Library/Homebrew/extend/ARGV.rb @@ -30,7 +30,7 @@ module HomebrewArgvExtension if f.any_version_installed? tab = Tab.for_formula(f) resolved_spec = spec(nil) || tab.spec - f.set_active_spec(resolved_spec) if f.send(resolved_spec) + f.active_spec = resolved_spec if f.send(resolved_spec) f.build = tab if f.head? && tab.tabfile k = Keg.new(tab.tabfile.parent) diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb index b56aa56f3..27dc95d29 100644 --- a/Library/Homebrew/extend/ENV/std.rb +++ b/Library/Homebrew/extend/ENV/std.rb @@ -42,7 +42,7 @@ module Stdenv end # Os is the default Apple uses for all its stuff so let's trust them - set_cflags "-Os #{SAFE_CFLAGS_FLAGS}" + define_cflags "-Os #{SAFE_CFLAGS_FLAGS}" append "LDFLAGS", "-Wl,-headerpad_max_install_names" @@ -136,12 +136,12 @@ module Stdenv end def minimal_optimization - set_cflags "-Os #{SAFE_CFLAGS_FLAGS}" + define_cflags "-Os #{SAFE_CFLAGS_FLAGS}" end alias generic_minimal_optimization minimal_optimization def no_optimization - set_cflags SAFE_CFLAGS_FLAGS + define_cflags SAFE_CFLAGS_FLAGS end alias generic_no_optimization no_optimization @@ -206,7 +206,7 @@ module Stdenv end # Convenience method to set all C compiler flags in one shot. - def set_cflags(val) + def define_cflags(val) CC_FLAG_VARS.each { |key| self[key] = val } end |
