You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2022/12/22 17:03:59 UTC
[openoffice] branch trunk updated: Changes required w/ AOO42X and trunk
This is an automated email from the ASF dual-hosted git repository.
jim pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new f3ae5cfbdc Changes required w/ AOO42X and trunk
f3ae5cfbdc is described below
commit f3ae5cfbdc7d1c66653548a9c37bac64d0a1abdd
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Thu Dec 22 12:02:13 2022 -0500
Changes required w/ AOO42X and trunk
(cherry picked from commit 18ec844f88251cfdd417f5e3ed96b962c7c8156a)
---
main/configure.ac | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/main/configure.ac b/main/configure.ac
index 52d313d430..62cd7932f4 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -1147,13 +1147,13 @@ case "$build_os" in
fi
SDKROOT="`xcrun --sdk macosx --show-sdk-path`"
if test ! -n "$CC"; then
- CC="`xcrun -f clang` -arch x86_64"
+ CC="`xcrun -f clang`"
fi
if test ! -n "$CXX"; then
- CXX="`xcrun -f clang++` -std=c++11 -stdlib=libc++ -arch x86_64"
+ CXX="`xcrun -f clang++` -std=c++11"
macos_c11=`pwd`/macos_c11
echo "#!/bin/sh" > $macos_c11
- echo "$CXX \$@" >> $macos_c11
+ echo "$CXX \"\$@\"" >> $macos_c11
chmod 755 $macos_c11
CXX="$macos_c11"
fi
@@ -3907,7 +3907,11 @@ if test "$_os" = "Darwin"; then
sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(10|11|12|13|14|15)" | sed -e "s/.*sdk //" | tail -n1`
dnl If not found, look for macOS11.x SDKs (Xcode 12.2 and later)
if test -z "$sdk_found"; then
- sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx11.(0|1)" | sed -e "s/.*sdk //" | tail -n1`
+ sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx11.(0|1|2|3)" | sed -e "s/.*sdk //" | tail -n1`
+ fi
+ dnl If not found, look for macOS12.x SDKs (Xcode 13.0 and later)
+ if test -z "$sdk_found"; then
+ sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx12.(0|1|2)" | sed -e "s/.*sdk //" | tail -n1`
fi
if test -z "$sdk_found"; then
AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found])