From fed9c9a9bec870929c2a646e97096c277ae148f8 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Fri, 5 Dec 2014 01:58:34 -0500 Subject: [PATCH] Simplify bsdmake wrapper Since bsdmake is always specified as a dependency, our xcrun wrapper will always be able to find it, so we can get rid of this wrapper. --- Library/ENV/4.3/bsdmake | 8 +------- Library/ENV/4.3/make | 2 +- 2 files changed, 2 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..fa7a198174 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 make "$@" +exec xcrun "${0##*/}" "$@"