From c84f7d0ab2cc23c85d476c66d899b2855ede51be Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Wed, 4 Dec 2013 00:37:11 -0600
Subject: [PATCH] Revert "Revert "Split bsdmake wrapper out from make wrapper""

I think enough time has passed that it is safe to do this now.

This reverts commit 1003161a848970e782633959904ea776dda7e48b.
---
 Library/ENV/4.3/bsdmake |  8 +++++++-
 Library/ENV/4.3/make    | 10 +---------
 2 files changed, 8 insertions(+), 10 deletions(-)
 mode change 120000 => 100755 Library/ENV/4.3/bsdmake

diff --git a/Library/ENV/4.3/bsdmake b/Library/ENV/4.3/bsdmake
deleted file mode 120000
index ac08cdcf95..0000000000
--- a/Library/ENV/4.3/bsdmake
+++ /dev/null
@@ -1 +0,0 @@
-make
\ No newline at end of file
diff --git a/Library/ENV/4.3/bsdmake b/Library/ENV/4.3/bsdmake
new file mode 100755
index 0000000000..72adb09419
--- /dev/null
+++ b/Library/ENV/4.3/bsdmake
@@ -0,0 +1,7 @@
+#!/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/make b/Library/ENV/4.3/make
index 1d717718b3..f7089de36b 100755
--- a/Library/ENV/4.3/make
+++ b/Library/ENV/4.3/make
@@ -1,11 +1,3 @@
 #!/bin/bash
 export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG"
-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
+exec xcrun make "$@"