From d1f1d736e8a2f61f6fd683d9696154e72b369b6b Mon Sep 17 00:00:00 2001 From: Max Howell Date: Thu, 13 Sep 2012 12:10:01 -0400 Subject: [PATCH] Don't add GL paths to superenv if depends_on X Fixes Homebrew/homebrew#14780. --- Library/Homebrew/superenv.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb index bdc271c3ef..681022c4a1 100644 --- a/Library/Homebrew/superenv.rb +++ b/Library/Homebrew/superenv.rb @@ -140,7 +140,7 @@ class << ENV # TODO prolly shouldn't always do this? paths << "#{sdk}/System/Library/Frameworks/Python.framework/Versions/Current/include/python2.7" 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.to_path_s end @@ -149,7 +149,7 @@ class << ENV sdk = MacOS.sdk_path if MacSystem.xcode43_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" + paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries" unless x11? paths << "#{MacSystem.x11_prefix}/lib" if x11? paths.to_path_s end