diff options
| author | Jack Nagel | 2014-05-13 12:13:05 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-05-13 12:14:51 -0500 |
| commit | 002cb64774ba04a147dfb84c2132361325726ad1 (patch) | |
| tree | 7cdf614a960e1fa0e24f8148bf951223a2aae4fb /Library | |
| parent | 3722516f43c1375c1929dd436c7211411c6096b1 (diff) | |
| download | brew-002cb64774ba04a147dfb84c2132361325726ad1.tar.bz2 | |
Make sure the path arrays only contain strings
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/extend/ENV/super.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index c2c44c3bf..f35fa1ff3 100644 --- a/Library/Homebrew/extend/ENV/super.rb +++ b/Library/Homebrew/extend/ENV/super.rb @@ -127,8 +127,8 @@ module Superenv paths << "#{MacOS::Xcode.toolchain_path}/usr/bin" end - paths += deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}/bin" } - paths << MacOS::X11.bin if x11? + paths += deps.map { |dep| "#{HOMEBREW_PREFIX}/opt/#{dep}/bin" } + paths << MacOS::X11.bin.to_s if x11? paths += %w{/usr/bin /bin /usr/sbin /sbin} # Homebrew's apple-gcc42 will be outside the PATH in superenv, @@ -139,12 +139,12 @@ module Superenv rescue Exception # in --debug, catch bare exceptions too nil end - paths << apple_gcc42.opt_prefix/'bin' if apple_gcc42 + paths << apple_gcc42.opt_bin.to_s if apple_gcc42 end if self['HOMEBREW_CC'] =~ GNU_GCC_REGEXP gcc_formula = gcc_version_formula($1) - paths << gcc_formula.opt_prefix/'bin' + paths << gcc_formula.opt_bin.to_s end paths.to_path_s |
