Author: jim
Date: Tue Aug 15 11:51:00 2017
New Revision: 1805069
URL: http://svn.apache.org/viewvc?rev=1805069&view=rev
Log:
macOS fixes... Source the correct file and allow for macOS XCode8 SDK
Modified:
openoffice/trunk/main/configure.ac
openoffice/trunk/main/source_soenv.sh
Modified: openoffice/trunk/main/configure.ac
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/configure.ac?rev=1805069&r1=1805068&r2=1805069&view=diff
==============================================================================
--- openoffice/trunk/main/configure.ac (original)
+++ openoffice/trunk/main/configure.ac Tue Aug 15 11:51:00 2017
@@ -3837,7 +3837,7 @@ if test "$_os" = "Darwin"; then
else
MACOSX_DEPLOYMENT_TARGET=$sdk_target
- sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(7|8|9|10|11)" |
sed -e "s/.*sdk //" | tail -n1`
+ sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(7|8|9|10|11|12)"
| sed -e "s/.*sdk //" | tail -n1`
if test -z "$sdk_found"; then
AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found])
else
Modified: openoffice/trunk/main/source_soenv.sh
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/source_soenv.sh?rev=1805069&r1=1805068&r2=1805069&view=diff
==============================================================================
--- openoffice/trunk/main/source_soenv.sh (original)
+++ openoffice/trunk/main/source_soenv.sh Tue Aug 15 11:51:00 2017
@@ -106,7 +106,7 @@ else
;;
# the result here (whether you get x86_64) seems to depend on $CC...
i[3456]86-*-darwin*|x86_64-*-darwin*)
- . ./MacOSXX86Env.Set.sh
+ . ./MacOSXX64Env.Set.sh
;;
powerpc-*-darwin*)
. ./MacOSXPPCEnv.Set.sh
