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

ENV.x11: only use SDK when CLT is missing and X11 is from Apple

Browse Source
This commit is contained in:
Jack Nagel 2013-10-04 21:06:18 -05:00
parent b2bb0e22f4
commit 2bbe2dba16
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/extend/ENV/std.rb
View File

@ -288,10 +288,11 @@ module Stdenv
append_path 'ACLOCAL_PATH', MacOS::X11.share/'aclocal' 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_path 'CMAKE_PREFIX_PATH', MacOS.sdk_path/'usr/X11'
append 'CFLAGS', "-I#{MacOS::X11.include}"
end end
append 'CFLAGS', "-I#{MacOS::X11.include}" unless MacOS::CLT.installed?
end end
alias_method :libpng, :x11 alias_method :libpng, :x11