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

Commit

Permalink
chuck: fix OS X version detection regex for 10.10
Browse files Browse the repository at this point in the history
Fixes #34189.
Closes #34192.
  • Loading branch information
mistydemeo committed Nov 14, 2014
1 parent 4dc3a66 commit 6f24b31
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions Library/Formula/chuck.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ class Chuck < Formula

# Homebrew already takes care of setting the sysroot;
# also lets the build work on CLT.
# Also fixes the version regex for 10.10+; reported to chuck-dev.
patch :DATA

def install
Expand All @@ -18,15 +19,17 @@ def install

__END__
diff --git a/src/makefile.osx b/src/makefile.osx
index 4531ee1..cd4a910 100644
index 4531ee1..65cee97 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -2,8 +2,6 @@
@@ -1,9 +1,7 @@
# uncomment the following to force 32-bit compilation
# FORCE_M32=-m32

ifneq ($(shell sw_vers -productVersion | egrep '10\.[6789](\.[0-9]+)?'),)
-ifneq ($(shell sw_vers -productVersion | egrep '10\.[6789](\.[0-9]+)?'),)
-SDK=$(shell xcodebuild -sdk macosx -version | grep '^Path:' | sed 's/Path: \(.*\)/\1/')
-ISYSROOT=-isysroot $(SDK)
+ifneq ($(shell sw_vers -productVersion | egrep '10\.([6789]|1[0-9]+)(\.[0-9]+)?'),)
LINK_EXTRAS=-F/System/Library/PrivateFrameworks \
-weak_framework MultitouchSupport
else

0 comments on commit 6f24b31

Please sign in to comment.