Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
brew
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to JiHu GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
KMSCAKKSCFKA AKFACAMADCAS
brew
Commits
2f052a2f
Commit
2f052a2f
authored
11 years ago
by
Jack Nagel
Browse files
Options
Downloads
Patches
Plain Diff
Remove another unnecessary check
parent
490cb348
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Library/Homebrew/os/mac.rb
+3
-3
3 additions, 3 deletions
Library/Homebrew/os/mac.rb
with
3 additions
and
3 deletions
Library/Homebrew/os/mac.rb
+
3
−
3
View file @
2f052a2f
...
...
@@ -36,7 +36,7 @@ module OS
# If it's not there, or xcode-select is misconfigured, we have to
# look in dev_tools_path, and finally in xctoolchain_path, because the
# tools were split over two locations beginning with Xcode 4.3+.
xcrun_path
=
unless
Xcode
.
bad_xcode_select_path?
xcrun_path
=
begin
path
=
`/usr/bin/xcrun -find
#{
tool
}
2>/dev/null`
.
chomp
# If xcrun finds a superenv tool then discard the result.
path
unless
path
.
include?
(
"Library/ENV"
)
...
...
@@ -60,7 +60,7 @@ module OS
elsif
tools_in_prefix?
"/"
# probably a safe enough assumption (the unix way)
Pathname
.
new
"/usr/bin"
elsif
not
Xcode
.
bad_xcode_select_path?
and
not
`/usr/bin/xcrun -find make 2>/dev/null`
.
empty?
elsif
not
`/usr/bin/xcrun -find make 2>/dev/null`
.
empty?
# Note that the exit status of system "xcrun foo" isn't always accurate
# Wherever "make" is there are the dev tools.
Pathname
.
new
(
`/usr/bin/xcrun -find make`
.
chomp
).
dirname
...
...
@@ -88,7 +88,7 @@ module OS
(
@sdk_path
||=
{}).
fetch
(
v
.
to_s
)
do
|
key
|
opts
=
[]
# First query Xcode itself
opts
<<
`
#{
locate
(
'xcodebuild'
)
}
-version -sdk macosx
#{
v
}
Path 2>/dev/null`
.
chomp
unless
Xcode
.
bad_xcode_select_path?
opts
<<
`
#{
locate
(
'xcodebuild'
)
}
-version -sdk macosx
#{
v
}
Path 2>/dev/null`
.
chomp
# Xcode.prefix is pretty smart, so lets look inside to find the sdk
opts
<<
"
#{
Xcode
.
prefix
}
/Platforms/MacOSX.platform/Developer/SDKs/MacOSX
#{
v
}
.sdk"
# Xcode < 4.3 style
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment