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

Merge pull request #7303 from Bo98/xcrun

Browse Source 
shims/mac/super/xcrun: unset rather than emptying DEVELOPER_DIR
This commit is contained in:
Mike McQuaid 2020-04-08 14:46:46 +01:00 committed by GitHub
commit ba63e93b9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/shims/mac/super/xcrun
View File

@ -4,14 +4,14 @@
# it and attempts to avoid these issues. # it and attempts to avoid these issues.
# These could be used in conjunction with `--sdk` which ignores SDKROOT. # These could be used in conjunction with `--sdk` which ignores SDKROOT.
if [[ "$*" =~ (^| )-?-show-sdk-(path|version|build) ]]; then if [[ "$*" =~ (^| )-?-show-sdk-(path|version|build) && -n "$HOMEBREW_DEVELOPER_DIR" ]]; then
export DEVELOPER_DIR=$HOMEBREW_DEVELOPER_DIR export DEVELOPER_DIR=$HOMEBREW_DEVELOPER_DIR
else else
# Some build tools set DEVELOPER_DIR, so discard it # Some build tools set DEVELOPER_DIR, so discard it
unset DEVELOPER_DIR unset DEVELOPER_DIR
fi fi
if [ -z "$SDKROOT" ]; then if [[ -z "$SDKROOT" && -n "$HOMEBREW_SDKROOT" ]]; then
export SDKROOT=$HOMEBREW_SDKROOT export SDKROOT=$HOMEBREW_SDKROOT
fi fi