Merge pull request #2700 from sjackman/env-std-linux

Stdenv: Add ENV.libxml2 and ENV.x11 for Linux

3 files changed, 14 insertions, 1 deletions

diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb
index c4cc0985f..91189f53a 100644
--- a/Library/Homebrew/extend/ENV/std.rb
+++ b/Library/Homebrew/extend/ENV/std.rb
@@ -210,6 +210,8 @@ module Stdenv
   end
   alias generic_set_cpu_flags set_cpu_flags
 
+  def x11; end
+
   # @private
   def effective_arch
     if ARGV.build_bottle?
diff --git a/Library/Homebrew/extend/os/extend/ENV/std.rb b/Library/Homebrew/extend/os/extend/ENV/std.rb
index 8e6b13a61..18ede5b9e 100644
--- a/Library/Homebrew/extend/os/extend/ENV/std.rb
+++ b/Library/Homebrew/extend/os/extend/ENV/std.rb
@@ -1,2 +1,6 @@
 require "extend/ENV/std"
-require "extend/os/mac/extend/ENV/std" if OS.mac?
+if OS.mac?
+  require "extend/os/mac/extend/ENV/std"
+elsif OS.linux?
+  require "extend/os/linux/extend/ENV/std"
+end
diff --git a/Library/Homebrew/extend/os/linux/extend/ENV/std.rb b/Library/Homebrew/extend/os/linux/extend/ENV/std.rb
new file mode 100644
index 000000000..ed19d2495
--- /dev/null
+++ b/Library/Homebrew/extend/os/linux/extend/ENV/std.rb
@@ -0,0 +1,7 @@
+module Stdenv
+  def libxml2
+    append "CPPFLAGS", "-I#{Formula["libxml2"].include/"libxml2"}"
+  rescue FormulaUnavailableError
+    nil
+  end
+end