Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

shims/super/cc: detect High Sierra differently. #4952

Merged
merged 1 commit into from
Sep 20, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions Library/Homebrew/brew.sh
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ export HOMEBREW_PROCESSOR
export HOMEBREW_PRODUCT
export HOMEBREW_OS_VERSION
export HOMEBREW_MACOS_VERSION
export HOMEBREW_MACOS_VERSION_NUMERIC
export HOMEBREW_USER_AGENT
export HOMEBREW_USER_AGENT_CURL

Expand Down
7 changes: 1 addition & 6 deletions Library/Homebrew/shims/scm/git
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,7 @@ then
xcode_path="$(/usr/bin/xcode-select -print-path 2>/dev/null)"
if [[ -z "$xcode_path" ]]
then
if [[ -z "$HOMEBREW_MACOS_VERSION" ]]
then
HOMEBREW_MACOS_VERSION="$(/usr/bin/sw_vers -productVersion)"
fi
printf -v macos_version_numeric "%02d%02d%02d" ${HOMEBREW_MACOS_VERSION//./ }
if [[ "$macos_version_numeric" -ge "100900" ]]
if [[ "$HOMEBREW_MACOS_VERSION_NUMERIC" -ge "100900" ]]
then
popup_stub=1
fi
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/shims/super/cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def mac?
end

def high_sierra_or_later?
mac? && RUBY_PLATFORM[/darwin\d+/][/\d+/].to_i >= 17
mac? && ENV["HOMEBREW_MACOS_VERSION_NUMERIC"].to_s.to_i >= 101300
end

def linux?
Expand Down