diff options
| author | Jack Nagel | 2014-09-11 16:46:42 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-09-11 16:50:56 -0500 |
| commit | c98fe91f13d60f411dfd5dee1e84ae2a9100cd96 (patch) | |
| tree | f02256a90ff2d8156a36fc7e8490166bf9881290 /Library/Homebrew/extend/ENV/std.rb | |
| parent | c5885757e5586cb69c4d9a09d66772ea712c89bb (diff) | |
| download | brew-c98fe91f13d60f411dfd5dee1e84ae2a9100cd96.tar.bz2 | |
Don't directly assign Pathname objects to environment variables
Fixes Homebrew/homebrew#32234.
Diffstat (limited to 'Library/Homebrew/extend/ENV/std.rb')
| -rw-r--r-- | Library/Homebrew/extend/ENV/std.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb index 58c021bd6..1f636ac45 100644 --- a/Library/Homebrew/extend/ENV/std.rb +++ b/Library/Homebrew/extend/ENV/std.rb @@ -42,10 +42,11 @@ module Stdenv self['CMAKE_PREFIX_PATH'] = "#{HOMEBREW_PREFIX}" end - if (HOMEBREW_PREFIX/'Frameworks').exist? - append 'CPPFLAGS', "-F#{HOMEBREW_PREFIX}/Frameworks" - append 'LDFLAGS', "-F#{HOMEBREW_PREFIX}/Frameworks" - self['CMAKE_FRAMEWORK_PATH'] = HOMEBREW_PREFIX/"Frameworks" + frameworks = HOMEBREW_PREFIX.join("Frameworks") + if frameworks.directory? + append "CPPFLAGS", "-F#{frameworks}" + append "LDFLAGS", "-F#{frameworks}" + self["CMAKE_FRAMEWORK_PATH"] = frameworks.to_s end # Os is the default Apple uses for all its stuff so let's trust them |