superenv fix for broken 10.8 apr-1-config

serf requires you to explicitly tell it where to find the supertool because otherwise it has a hardcoded /usr/bin/apr-1-config (:P), ctail however is sensible and searches the PATH so now it's as though we do nothing special in that formula. Nice.

2 files changed, 21 insertions, 4 deletions

diff --git a/Library/ENV/4.3/apr-1-config b/Library/ENV/4.3/apr-1-config
new file mode 100755
index 000000000..40ad6478e
--- /dev/null
+++ b/Library/ENV/4.3/apr-1-config
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+if [[ "$HOMEBREW_CCCFG" == *a* ]]; then
+  case "$1" in
+  --cc) echo "cc";;
+  --cpp) echo "cpp";;
+  --includedir) echo "$HOMEBREW_SDKROOT/usr/include/apr-1";;
+  --includes) echo "-isystem$HOMEBREW_SDKROOT/usr/include/apr-1";;
+  --apr-libtool) echo "glibtool";;
+  *)
+    exec xcrun apr-1-config "$@";;
+  esac
+else
+  exec /usr/bin/apr-1-config "$@"
+fi
diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb
index 5161e7e6c..e8e15c21f 100644
--- a/Library/Homebrew/superenv.rb
+++ b/Library/Homebrew/superenv.rb
@@ -11,14 +11,14 @@ require 'macos'
 # 7) Simpler formula that *just work*
 # 8) Build-system agnostic configuration of the tool-chain
 
-def superenv_bin
+def superbin
   @bin ||= (HOMEBREW_REPOSITORY/"Library/ENV").children.reject{|d| d.basename.to_s > MacOS::Xcode.version }.max
 end
 
 def superenv?
   not MacOS::Xcode.bad_xcode_select_path? and # because xcrun won't work
   not MacOS::Xcode.folder.nil? and # because xcrun won't work
-  superenv_bin and superenv_bin.directory? and
+  superbin and superbin.directory? and
   not ARGV.include? "--env=std"
 end
 
@@ -97,7 +97,7 @@ class << ENV
   end
 
   def determine_path
-    paths = [superenv_bin]
+    paths = [superbin]
     if MacSystem.xcode43_without_clt?
       paths << "#{MacSystem.xcode43_developer_dir}/usr/bin"
       paths << "#{MacSystem.xcode43_developer_dir}/Toolchains/XcodeDefault.xctoolchain/usr/bin"
@@ -156,9 +156,11 @@ class << ENV
 
   def determine_cccfg
     s = ""
+    s << 'b' if ARGV.build_bottle?
     # Fix issue with sed barfing on unicode characters on Mountain Lion
     s << 's' if MacOS.mountain_lion?
-    s << 'b' if ARGV.build_bottle?
+    # Fix issue with 10.8 apr-1-config having broken paths
+    s << 'a' if MacOS.cat == :mountainlion
     s
   end