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.

Sign up for GitHub

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

Remove Xcode.installed? guards. #4083

Merged
merged 1 commit into from
Apr 17, 2018
Merged

Remove Xcode.installed? guards. #4083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Library/Homebrew/formula.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1294,7 +1294,7 @@ def std_cmake_args

# Avoid false positives for clock_gettime support on 10.11.
# CMake cache entries for other weak symbols may be added here as needed.
if MacOS.version == "10.11" && MacOS::Xcode.installed? && MacOS::Xcode.version >= "8.0"
if MacOS.version == "10.11" && MacOS::Xcode.version >= "8.0"
args << "-DHAVE_CLOCK_GETTIME:INTERNAL=0"
end

Expand Down
4 changes: 2 additions & 2 deletions Library/Homebrew/formula_support.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ def valid?
when :provided_pre_high_sierra
MacOS.version < :high_sierra
when :provided_until_xcode43
MacOS::Xcode.installed? && MacOS::Xcode.version < "4.3"
MacOS::Xcode.version < "4.3"
when :provided_until_xcode5
MacOS::Xcode.installed? && MacOS::Xcode.version < "5.0"
MacOS::Xcode.version < "5.0"
else
true
end
Expand Down
4 changes: 1 addition & 3 deletions Library/Homebrew/os/mac/xcode.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,7 @@ def version
def detect_version
# CLT isn't a distinct entity pre-4.3, and pkgutil doesn't exist
# at all on Tiger, so just count it as installed if Xcode is installed
if MacOS::Xcode.installed? && MacOS::Xcode.version < "3.0"
return MacOS::Xcode.version
end
return MacOS::Xcode.version if MacOS::Xcode.version < "3.0"

version = nil
[MAVERICKS_PKG_ID, MAVERICKS_NEW_PKG_ID, STANDALONE_PKG_ID, FROM_XCODE_PKG_ID].each do |id|
Expand Down