diff options
| author | Jack Nagel | 2014-05-12 11:45:50 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-05-12 11:45:50 -0500 |
| commit | ff9191eca234f70cd103beb9fbba7bc91e82c446 (patch) | |
| tree | 901a15e13981f10e61c7ade98260dfd87d084f4f /Library/Homebrew | |
| parent | 38765ae9fd52b32030822e3be8f86e3dd7ddebaf (diff) | |
| download | brew-ff9191eca234f70cd103beb9fbba7bc91e82c446.tar.bz2 | |
clean up X11 conditionals
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/extend/ENV/super.rb | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index 4b5581078..f15d8cc25 100644 --- a/Library/Homebrew/extend/ENV/super.rb +++ b/Library/Homebrew/extend/ENV/super.rb @@ -176,17 +176,22 @@ module Superenv paths = [] paths << "#{sdk}/usr/include/libxml2" unless deps.include? 'libxml2' paths << "#{sdk}/usr/include/apache2" if MacOS::Xcode.without_clt? - paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers" unless x11? - paths << MacOS::X11.include << "#{MacOS::X11.include}/freetype2" if x11? + if x11? + paths << MacOS::X11.include << "#{MacOS::X11.include}/freetype2" + else + paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers" + end paths.to_path_s end def determine_cmake_library_path sdk = MacOS.sdk_path if MacOS::Xcode.without_clt? paths = [] - # things expect to find GL headers since X11 used to be a default, so we add them - paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries" unless x11? - paths << MacOS::X11.lib if x11? + if x11? + paths << MacOS::X11.lib + else + paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries" + end paths.to_path_s end |