From d85d5fba22c6d3d2dbbe6368fde518092bd24cb0 Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Fri, 5 Dec 2014 16:54:07 -0500
Subject: Revert "Simplify bsdmake wrapper"

Fixes Homebrew/homebrew#34713.

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

(limited to 'Library')

diff --git a/Library/ENV/4.3/bsdmake b/Library/ENV/4.3/bsdmake
deleted file mode 120000
index ac08cdcf9..000000000
--- 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 000000000..72adb0941
--- /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 fa7a19817..f7089de36 100755
--- a/Library/ENV/4.3/make
+++ b/Library/ENV/4.3/make
@@ -1,3 +1,3 @@
 #!/bin/bash
 export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG"
-exec xcrun "${0##*/}" "$@"
+exec xcrun make "$@"
-- 
cgit v1.2.3