chuck: fix OS X version detection regex for 10.10
Fixes Homebrew/homebrew#34189. Closes Homebrew/homebrew#34192.
This commit is contained in:
parent
65fd3ef09a
commit
ecf5849cd7
1 changed files with 6 additions and 3 deletions
|
@ -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
|
||||
|
@ -18,15 +19,17 @@ end
|
|||
|
||||
__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
|
||||
|
|
Loading…
Reference in a new issue