diff options
| -rw-r--r-- | Library/Homebrew/build_options.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/software_spec.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/test/test_build_options.rb | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Library/Homebrew/build_options.rb b/Library/Homebrew/build_options.rb index 19169af3d..f3c7e856e 100644 --- a/Library/Homebrew/build_options.rb +++ b/Library/Homebrew/build_options.rb @@ -4,7 +4,7 @@ class BuildOptions attr_accessor :universal def initialize(args, options) - @args = args + @args = Options.coerce(args) @options = options end diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb index e88975a73..c595a4596 100644 --- a/Library/Homebrew/software_spec.rb +++ b/Library/Homebrew/software_spec.rb @@ -34,7 +34,7 @@ class SoftwareSpec @bottle_specification = BottleSpecification.new @patches = [] @options = Options.new - @build = BuildOptions.new(Options.coerce(ARGV.options_only), options) + @build = BuildOptions.new(ARGV.options_only, options) end def owner= owner diff --git a/Library/Homebrew/test/test_build_options.rb b/Library/Homebrew/test/test_build_options.rb index 4ee12974b..e3ed44f9d 100644 --- a/Library/Homebrew/test/test_build_options.rb +++ b/Library/Homebrew/test/test_build_options.rb @@ -3,8 +3,10 @@ require 'build_options' class BuildOptionsTests < Homebrew::TestCase def setup - args = Options.coerce(%w(--with-foo --with-bar --without-qux)) - opts = Options.coerce(%w(--with-foo --with-bar --without-baz --without-qux)) + args = %w{--with-foo --with-bar --without-qux} + opts = Options.new + opts << Option.new("with-foo") << Option.new("with-bar") + opts << Option.new("without-baz") << Option.new("without-qux") @build = BuildOptions.new(args, opts) end |