diff options
| author | Jack Nagel | 2013-10-04 21:06:18 -0500 |
|---|---|---|
| committer | Jack Nagel | 2013-10-04 21:06:18 -0500 |
| commit | 2bbe2dba160996108fb761eccd481f7580aa0492 (patch) | |
| tree | fb4945894bcf9aa42a3214c0529fdeab615015d4 /Library | |
| parent | b2bb0e22f4deca43356dc0dca56282429d0c332a (diff) | |
| download | brew-2bbe2dba160996108fb761eccd481f7580aa0492.tar.bz2 | |
ENV.x11: only use SDK when CLT is missing and X11 is from Apple
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/extend/ENV/std.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb index 7c22dd2e1..03273fc88 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 |