Skip to content
This repository has been archived by the owner on Jul 4, 2023. It is now read-only.

osxfuse: Fix xcode 6.1 compatibility #32237

Closed
wants to merge 3 commits into from
Closed

osxfuse: Fix xcode 6.1 compatibility #32237

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fff337
osxfuse: Fix xcode 6.1 compatibility
youtux Sep 11, 2014
c35ed7b
added patch comment
youtux Sep 11, 2014
556d596
Update osxfuse.rb
youtux Sep 11, 2014
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
18 changes: 18 additions & 0 deletions Library/Formula/osxfuse.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ class Osxfuse < Formula

conflicts_with "fuse4x", :because => "both install `fuse.pc`"

# Fix for Xcode 6.1 beta
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

# Fix for Xcode 6.1 beta: https://github.com/osxfuse/osxfuse/pull/159

patch :DATA

def install
# Do not override Xcode build settings
ENV.remove_cc_etc
Expand All @@ -47,3 +50,18 @@ def caveats; <<-EOS.undent
EOS
end
end

__END__
diff --git a/build.sh b/build.sh
index 53724f2..f3275fb 100755
--- a/build.sh
+++ b/build.sh
@@ -2387,7 +2387,7 @@ function m_handler()
M_XCODE51_VERSION=$m_xcode_version
fi
;;
- 6.0*)
+ 6.0*|6.1*)
m_version_compare $M_XCODE60_VERSION $m_xcode_version
if [[ $? != 2 ]]
then