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
74839417
Commit
74839417
authored
12 years ago
by
Jack Nagel
Browse files
Options
Downloads
Patches
Plain Diff
Rename xctools_fucked?
Signed-off-by:
Jack Nagel
<
jacknagel@gmail.com
>
parent
a772fb97
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Library/Homebrew/cmd/doctor.rb
+1
-1
1 addition, 1 deletion
Library/Homebrew/cmd/doctor.rb
Library/Homebrew/macos.rb
+3
-3
3 additions, 3 deletions
Library/Homebrew/macos.rb
Library/Homebrew/xcode.rb
+2
-2
2 additions, 2 deletions
Library/Homebrew/xcode.rb
with
6 additions
and
6 deletions
Library/Homebrew/cmd/doctor.rb
+
1
−
1
View file @
74839417
...
...
@@ -402,7 +402,7 @@ end
def
check_xcode_select_path
# with the advent of CLT-only support, we don't need xcode-select
return
if
MacOS
::
CLT
.
installed?
unless
File
.
file?
"
#{
MacOS
::
Xcode
.
folder
}
/usr/bin/xcodebuild"
and
not
MacOS
::
Xcode
.
xctools_fucked
?
unless
File
.
file?
"
#{
MacOS
::
Xcode
.
folder
}
/usr/bin/xcodebuild"
and
not
MacOS
::
Xcode
.
bad_xcode_select_path
?
path
=
MacOS
.
app_with_bundle_id
(
MacOS
::
Xcode
::
V4_BUNDLE_ID
)
||
MacOS
.
app_with_bundle_id
(
MacOS
::
Xcode
::
V3_BUNDLE_ID
)
path
=
'/Developer'
if
path
.
nil?
or
not
path
.
directory?
<<-
EOS
.
undent
...
...
This diff is collapsed.
Click to expand it.
Library/Homebrew/macos.rb
+
3
−
3
View file @
74839417
...
...
@@ -36,7 +36,7 @@ module MacOS extend self
else
# Xcrun was provided first with Xcode 4.3 and allows us to proxy
# tool usage thus avoiding various bugs.
p
=
`/usr/bin/xcrun -find
#{
tool
}
2>/dev/null`
.
chomp
unless
Xcode
.
xctools_fucked
?
p
=
`/usr/bin/xcrun -find
#{
tool
}
2>/dev/null`
.
chomp
unless
Xcode
.
bad_xcode_select_path
?
if
!
p
.
nil?
and
!
p
.
empty?
and
File
.
executable?
p
path
=
Pathname
.
new
p
else
...
...
@@ -67,7 +67,7 @@ module MacOS extend self
@dev_tools_path
||=
if
File
.
exist?
"/usr/bin/cc"
and
File
.
exist?
"/usr/bin/make"
# probably a safe enough assumption (the unix way)
Pathname
.
new
"/usr/bin"
elsif
not
Xcode
.
xctools_fucked
?
and
system
"/usr/bin/xcrun -find make 1>/dev/null 2>&1"
elsif
not
Xcode
.
bad_xcode_select_path
?
and
system
"/usr/bin/xcrun -find make 1>/dev/null 2>&1"
# Wherever "make" is there are the dev tools.
Pathname
.
new
(
`/usr/bin/xcrun -find make`
.
chomp
).
dirname
elsif
File
.
exist?
"
#{
Xcode
.
prefix
}
/usr/bin/make"
...
...
@@ -93,7 +93,7 @@ module MacOS extend self
def
sdk_path
v
=
version
@sdk_path
||=
begin
path
=
if
not
Xcode
.
xctools_fucked
?
and
File
.
executable?
"
#{
Xcode
.
folder
}
/usr/bin/make"
path
=
if
not
Xcode
.
bad_xcode_select_path
?
and
File
.
executable?
"
#{
Xcode
.
folder
}
/usr/bin/make"
`
#{
locate
(
'xcodebuild'
)
}
-version -sdk macosx
#{
v
}
Path 2>/dev/null`
.
strip
elsif
File
.
directory?
'/Developer/SDKs/MacOS#{v}.sdk'
# the old default (or wild wild west style)
...
...
This diff is collapsed.
Click to expand it.
Library/Homebrew/xcode.rb
+
2
−
2
View file @
74839417
...
...
@@ -12,7 +12,7 @@ module MacOS::Xcode extend self
end
# Xcode 4.3 tools hang if "/" is set
def
xctools_fucked
?
def
bad_xcode_select_path
?
folder
==
"/"
end
...
...
@@ -68,7 +68,7 @@ module MacOS::Xcode extend self
end
# Xcode 4.3 xc* tools hang indefinately if xcode-select path is set thus
raise
if
xctools_fucked
?
raise
if
bad_xcode_select_path
?
raise
unless
which
"xcodebuild"
`xcodebuild -version 2>/dev/null`
=~
/Xcode (\d(\.\d)*)/
...
...
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