Merge pull request #11196 from hyuraku/remove_HOMEBREW_MAKE

remove HOMEBREW_MAKE
This commit is contained in:
Mike McQuaid 2021-04-21 13:01:21 +01:00 committed by GitHub
commit d3edf6155c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 19 deletions

View File

@ -13,16 +13,11 @@ pathremove() {
export "${PATHVARIABLE}"="${NEWPATH}" export "${PATHVARIABLE}"="${NEWPATH}"
} }
if [[ -n "${HOMEBREW_MAKE}" && "${HOMEBREW_MAKE}" != "make" ]]
then
export MAKE="${HOMEBREW_MAKE}"
else
SAVED_PATH="${PATH}" SAVED_PATH="${PATH}"
pathremove "${HOMEBREW_LIBRARY}/Homebrew/shims/linux/super" pathremove "${HOMEBREW_LIBRARY}/Homebrew/shims/linux/super"
MAKE="$(command -v make)" MAKE="$(command -v make)"
export MAKE export MAKE
export PATH="${SAVED_PATH}" export PATH="${SAVED_PATH}"
fi
export HOMEBREW_CCCFG="O${HOMEBREW_CCCFG}" export HOMEBREW_CCCFG="O${HOMEBREW_CCCFG}"

View File

@ -1,12 +1,4 @@
#!/bin/bash #!/bin/bash
# shellcheck disable=SC2154
# HOMEBREW_CCCFG is set by extend/ENV/super.rb
if [[ -n "${HOMEBREW_MAKE}" && "${HOMEBREW_MAKE}" != "make" ]]
then
export MAKE="${HOMEBREW_MAKE}"
else
MAKE="make"
fi
export HOMEBREW_CCCFG="O${HOMEBREW_CCCFG}" export HOMEBREW_CCCFG="O${HOMEBREW_CCCFG}"
exec xcrun "${MAKE}" "$@" exec xcrun "make" "$@"