From 2bbe2dba160996108fb761eccd481f7580aa0492 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Fri, 4 Oct 2013 21:06:18 -0500 Subject: [PATCH] ENV.x11: only use SDK when CLT is missing and X11 is from Apple --- Library/Homebrew/extend/ENV/std.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb index 7c22dd2e11..03273fc888 100644 --- a/Library/Homebrew/extend/ENV/std.rb +++ b/Library/Homebrew/extend/ENV/std.rb @@ -288,10 +288,11 @@ module Stdenv append_path 'ACLOCAL_PATH', MacOS::X11.share/'aclocal' - unless MacOS::CLT.installed? + if MacOS::XQuartz.provided_by_apple? and not MacOS::CLT.installed? append_path 'CMAKE_PREFIX_PATH', MacOS.sdk_path/'usr/X11' - append 'CFLAGS', "-I#{MacOS::X11.include}" end + + append 'CFLAGS', "-I#{MacOS::X11.include}" unless MacOS::CLT.installed? end alias_method :libpng, :x11