From 6ad6128f9b280ccbf1d5382744a50c8aa6dccff8 Mon Sep 17 00:00:00 2001 From: Maxim Belkin Date: Wed, 27 Jun 2018 14:08:00 -0500 Subject: [PATCH 1/2] Add make shim to Linux super env --- Library/Homebrew/shims/linux/super/make | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100755 Library/Homebrew/shims/linux/super/make diff --git a/Library/Homebrew/shims/linux/super/make b/Library/Homebrew/shims/linux/super/make new file mode 100755 index 0000000000..bd9d74c34c --- /dev/null +++ b/Library/Homebrew/shims/linux/super/make @@ -0,0 +1,10 @@ +#!/bin/bash + +if [[ -n "$HOMEBREW_MAKE" && "$HOMEBREW_MAKE" != "make" ]] +then + export MAKE="$HOMEBREW_MAKE" +else + MAKE="make" +fi +export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG" +exec "$MAKE" "$@" From 547751d067f2a47afc92a96f97825f8b1238763d Mon Sep 17 00:00:00 2001 From: Maxim Belkin Date: Wed, 27 Jun 2018 15:19:56 -0500 Subject: [PATCH 2/2] Remove infinite loophole --- Library/Homebrew/shims/linux/super/make | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Library/Homebrew/shims/linux/super/make b/Library/Homebrew/shims/linux/super/make index bd9d74c34c..8421ea17ce 100755 --- a/Library/Homebrew/shims/linux/super/make +++ b/Library/Homebrew/shims/linux/super/make @@ -7,4 +7,20 @@ else MAKE="make" fi export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG" + +pathremove () { + local IFS=':' + local NEWPATH + local DIR + local PATHVARIABLE=${2:-PATH} + for DIR in ${!PATHVARIABLE} ; do + if [ "$DIR" != "$1" ] ; then + NEWPATH=${NEWPATH:+$NEWPATH:}$DIR + fi + done + export $PATHVARIABLE="$NEWPATH" +} + +pathremove "$HOMEBREW_LIBRARY/Homebrew/shims/linux/super" + exec "$MAKE" "$@"