admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Don't add GL paths to superenv if depends_on X

Browse Source 
Fixes Homebrew/homebrew#14780.
This commit is contained in:
Max Howell 2012-09-13 12:10:01 -04:00
parent 514b1b54cd
commit d1f1d736e8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/superenv.rb
View File

@ -140,7 +140,7 @@ class << ENV
# TODO prolly shouldn't always do this? # TODO prolly shouldn't always do this?
paths << "#{sdk}/System/Library/Frameworks/Python.framework/Versions/Current/include/python2.7" paths << "#{sdk}/System/Library/Frameworks/Python.framework/Versions/Current/include/python2.7"
end end
paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers/" paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers/" unless x11?
paths << "#{MacSystem.x11_prefix}/include" if x11? paths << "#{MacSystem.x11_prefix}/include" if x11?
paths.to_path_s paths.to_path_s
end end
@ -149,7 +149,7 @@ class << ENV
sdk = MacOS.sdk_path if MacSystem.xcode43_without_clt? sdk = MacOS.sdk_path if MacSystem.xcode43_without_clt?
paths = [] paths = []
# things expect to find GL headers since X11 used to be a default, so we add them # 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" paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries" unless x11?
paths << "#{MacSystem.x11_prefix}/lib" if x11? paths << "#{MacSystem.x11_prefix}/lib" if x11?
paths.to_path_s paths.to_path_s
end end