aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorDominyk Tiller2016-07-15 05:22:04 +0100
committerDominyk Tiller2016-07-15 05:23:28 +0100
commit91af4aa0fec338c7938956334921d3ef89934fea (patch)
tree2f5c3baa3e0d9e68288bedb7d4297bc54c7c5661 /Library
parent706e7e71a07784f14abbdf5f019428e04afcfae6 (diff)
downloadbrew-91af4aa0fec338c7938956334921d3ef89934fea.tar.bz2
super: migrate xml2 cmake to mac/super
Looks like it was accidentally left behind (?)
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/extend/ENV/super.rb1
-rw-r--r--Library/Homebrew/extend/os/mac/extend/ENV/super.rb1
2 files changed, 1 insertions, 1 deletions
diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb
index 173bd5fde..63522022e 100644
--- a/Library/Homebrew/extend/ENV/super.rb
+++ b/Library/Homebrew/extend/ENV/super.rb
@@ -200,7 +200,6 @@ module Superenv
def determine_cmake_include_path
paths = []
- paths << "#{effective_sysroot}/usr/include/libxml2" unless deps.any? { |d| d.name == "libxml2" }
paths += homebrew_extra_cmake_include_paths
paths.to_path_s
end
diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb
index 9e0a25137..77625f455 100644
--- a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb
+++ b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb
@@ -55,6 +55,7 @@ module Superenv
def homebrew_extra_cmake_include_paths
paths = []
+ paths << "#{effective_sysroot}/usr/include/libxml2" unless deps.any? { |d| d.name == "libxml2" }
paths << "#{effective_sysroot}/usr/include/apache2" if MacOS::Xcode.without_clt?
paths << MacOS::X11.include.to_s << "#{MacOS::X11.include}/freetype2" if x11?
paths << "#{effective_sysroot}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers"