admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #4570 from maxim-belkin/fix-linux-make-shim

Browse Source 
Fix for Linux make shim
This commit is contained in:
Mike McQuaid 2018-08-24 14:24:32 +01:00 committed by GitHub
commit cc63c12247
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Library/Homebrew/shims/linux/super/make
View File

@ -1,18 +1,7 @@
#!/bin/bash #!/bin/bash
if [[ -n "$HOMEBREW_MAKE" && "$HOMEBREW_MAKE" != "make" ]]
then
export MAKE="$HOMEBREW_MAKE"
else
MAKE="make"
fi
export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG"
pathremove () { pathremove () {
local IFS=':' local IFS=':' NEWPATH="" DIR="" PATHVARIABLE=${2:-PATH}
local NEWPATH
local DIR
local PATHVARIABLE=${2:-PATH}
for DIR in ${!PATHVARIABLE} ; do for DIR in ${!PATHVARIABLE} ; do
if [ "$DIR" != "$1" ] ; then if [ "$DIR" != "$1" ] ; then
NEWPATH=${NEWPATH:+$NEWPATH:}$DIR NEWPATH=${NEWPATH:+$NEWPATH:}$DIR
@ -21,6 +10,16 @@ pathremove () {
export $PATHVARIABLE="$NEWPATH" export $PATHVARIABLE="$NEWPATH"
} }
pathremove "$HOMEBREW_LIBRARY/Homebrew/shims/linux/super" if [[ -n "$HOMEBREW_MAKE" && "$HOMEBREW_MAKE" != "make" ]]
then
export MAKE="$HOMEBREW_MAKE"
else
SAVED_PATH="$PATH"
pathremove "$HOMEBREW_LIBRARY/Homebrew/shims/linux/super"
export MAKE="$(which make)"
export PATH="$SAVED_PATH"
fi
export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG"
exec "$MAKE" "$@" exec "$MAKE" "$@"