[Libreoffice-commits] core.git: Branch 'aoo/trunk' - configure.in
Herbert Dürr
hdu at apache.org
Fri Dec 5 00:10:38 PST 2014
configure.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 78d58bc5b0ff535551c819d214535067fcaa05f0
Author: Herbert Dürr <hdu at apache.org>
Date: Fri Dec 5 07:46:41 2014 +0000
#i125921# fix autodetection of the OSX 10.10 SDK
which failed because the autodetection only worked with single-digit
minor-versions.
Patch-by: Thorsten Wagner <thorsten.wagner.4 at gmail.com>
Found-by: Thorsten Wagner <thorsten.wagner.4 at gmail.com>
Review-by: Herbert Duerr <hdu at apache.org>
diff --git a/configure.in b/configure.in
index b7d1fc3..ea90014 100644
--- a/configure.in
+++ b/configure.in
@@ -3936,7 +3936,7 @@ if test "$_os" = "Darwin"; then
else
MACOSX_DEPLOYMENT_TARGET=$sdk_target
- sdk_found=`xcodebuild -showsdks | grep "sdk macosx10.[[789]]" | sed -e "s/.*sdk //" | head -n1`
+ sdk_found=`xcodebuild -showsdks | egrep "sdk macosx10.(7|8|9|10)" | sed -e "s/.*sdk //" | tail -n1`
if test -z "$sdk_found"; then
AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found])
else
More information about the Libreoffice-commits
mailing list