diff options
| author | Jack Nagel | 2014-09-11 16:46:42 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-09-11 16:50:56 -0500 |
| commit | 78c7c5e35bd5ec28f861c8087e9ce7d72c0e681a (patch) | |
| tree | 74c429dab1234a15e8ddb344785ca929c3a03168 /Library | |
| parent | 475debf503bad752bcaab3a0298469327c5b5b1a (diff) | |
| download | homebrew-78c7c5e35bd5ec28f861c8087e9ce7d72c0e681a.tar.bz2 | |
Don't directly assign Pathname objects to environment variables
Fixes #32234.
Diffstat (limited to 'Library')
| -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 |
