From 6163c2a98e1be2a722627b05e933eb61d1f6c933 Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Thu, 14 Nov 2013 09:40:50 -0600
Subject: [PATCH] Revert "Split bsdmake wrapper out from make wrapper"

This reverts commit ba7ec6eb2f650ebc5a0ae09547eea423dbd45173.

Temporarily mitigate bug fixed in 1153d0f9e20d0b6a19203707b609634f8fea1ad5.
---
 Library/ENV/4.3/bsdmake |  8 +-------
 Library/ENV/4.3/make    | 10 +++++++++-
 2 files changed, 10 insertions(+), 8 deletions(-)
 mode change 100755 => 120000 Library/ENV/4.3/bsdmake

diff --git a/Library/ENV/4.3/bsdmake b/Library/ENV/4.3/bsdmake
deleted file mode 100755
index 72adb09419..0000000000
--- a/Library/ENV/4.3/bsdmake
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG"
-pwd="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-bsd="$pwd/../../../bin/bsdmake"
-# bsdmake used to be keg-only: support users who don't run brew doctor
-[ -x "$bsd" ] || bsd="$(${HOMEBREW_BREW_FILE} --prefix bsdmake)/bin/bsdmake"
-exec "$bsd" "$@"
diff --git a/Library/ENV/4.3/bsdmake b/Library/ENV/4.3/bsdmake
new file mode 120000
index 0000000000..ac08cdcf95
--- /dev/null
+++ b/Library/ENV/4.3/bsdmake
@@ -0,0 +1 @@
+make
\ No newline at end of file
diff --git a/Library/ENV/4.3/make b/Library/ENV/4.3/make
index f7089de36b..1d717718b3 100755
--- a/Library/ENV/4.3/make
+++ b/Library/ENV/4.3/make
@@ -1,3 +1,11 @@
 #!/bin/bash
 export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG"
-exec xcrun make "$@"
+if [ $(basename "$0") == "bsdmake" ]; then
+  pwd="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+  bsd="$pwd/../../../bin/bsdmake"
+  # bsdmake used to be keg-only: support users who don't run brew doctor
+  [ -x "$bsd" ] || bsd="$(${HOMEBREW_BREW_FILE} --prefix bsdmake)/bin/bsdmake"
+  exec "$bsd" "$@"
+else
+  exec xcrun make "$@"
+fi