| configure.ac (a46cde23) | configure.ac (18ec844f) |
|---|---|
| 1dnl * ************************************************************* 2dnl * 3dnl * Licensed to the Apache Software Foundation (ASF) under one 4dnl * or more contributor license agreements. See the NOTICE file 5dnl * distributed with this work for additional information 6dnl * regarding copyright ownership. The ASF licenses this file 7dnl * to you under the Apache License, Version 2.0 (the 8dnl * "License"); you may not use this file except in compliance --- 1142 unchanged lines hidden (view full) --- 1151 _os=Darwin 1152 if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then 1153 AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray]) 1154 echo "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >>warn 1155 enable_systray=no 1156 fi 1157 SDKROOT="`xcrun --sdk macosx --show-sdk-path`" 1158 if test ! -n "$CC"; then | 1dnl * ************************************************************* 2dnl * 3dnl * Licensed to the Apache Software Foundation (ASF) under one 4dnl * or more contributor license agreements. See the NOTICE file 5dnl * distributed with this work for additional information 6dnl * regarding copyright ownership. The ASF licenses this file 7dnl * to you under the Apache License, Version 2.0 (the 8dnl * "License"); you may not use this file except in compliance --- 1142 unchanged lines hidden (view full) --- 1151 _os=Darwin 1152 if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then 1153 AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray]) 1154 echo "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >>warn 1155 enable_systray=no 1156 fi 1157 SDKROOT="`xcrun --sdk macosx --show-sdk-path`" 1158 if test ! -n "$CC"; then |
| 1159 CC="`xcrun -f clang` -arch x86_64" | 1159 CC="`xcrun -f clang`" |
| 1160 fi 1161 if test ! -n "$CXX"; then | 1160 fi 1161 if test ! -n "$CXX"; then |
| 1162 CXX="`xcrun -f clang++` -std=c++11 -stdlib=libc++ -arch x86_64" | 1162 CXX="`xcrun -f clang++` -std=c++11" |
| 1163 macos_c11=`pwd`/macos_c11 1164 echo "#!/bin/sh" > $macos_c11 | 1163 macos_c11=`pwd`/macos_c11 1164 echo "#!/bin/sh" > $macos_c11 |
| 1165 echo "$CXX \$@" >> $macos_c11 | 1165 echo "$CXX \"\$@\"" >> $macos_c11 |
| 1166 chmod 755 $macos_c11 1167 CXX="$macos_c11" 1168 fi 1169 # Don't use OSVERSION until we know no conflicts result from it 1170 _darwin_version="`uname -r | $AWK -F . '{ print $1 }'`" 1171 # FIXME: Assumes 10.x, breaks w/ Big Sur 1172 _osx_version="10.`expr $_darwin_version - 4`" 1173 AC_MSG_NOTICE([Detected Darwin version: $_darwin_version ($_osx_version)]) --- 2737 unchanged lines hidden (view full) --- 3911 sdk_path=$with_macosx_sdk 3912 if test -z "$sdk_path"; then 3913 dnl --macosx-sdk not used (or blank): We look for the SDK 3914 dnl Why not MacOSX10.9.sdk? It lacks Python.h (!?) 3915 dnl First look for macOS10.x SDKs (Up thru Xcode 12.1) 3916 sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(10|11|12|13|14|15)" | sed -e "s/.*sdk //" | tail -n1` 3917 dnl If not found, look for macOS11.x SDKs (Xcode 12.2 and later) 3918 if test -z "$sdk_found"; then | 1166 chmod 755 $macos_c11 1167 CXX="$macos_c11" 1168 fi 1169 # Don't use OSVERSION until we know no conflicts result from it 1170 _darwin_version="`uname -r | $AWK -F . '{ print $1 }'`" 1171 # FIXME: Assumes 10.x, breaks w/ Big Sur 1172 _osx_version="10.`expr $_darwin_version - 4`" 1173 AC_MSG_NOTICE([Detected Darwin version: $_darwin_version ($_osx_version)]) --- 2737 unchanged lines hidden (view full) --- 3911 sdk_path=$with_macosx_sdk 3912 if test -z "$sdk_path"; then 3913 dnl --macosx-sdk not used (or blank): We look for the SDK 3914 dnl Why not MacOSX10.9.sdk? It lacks Python.h (!?) 3915 dnl First look for macOS10.x SDKs (Up thru Xcode 12.1) 3916 sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(10|11|12|13|14|15)" | sed -e "s/.*sdk //" | tail -n1` 3917 dnl If not found, look for macOS11.x SDKs (Xcode 12.2 and later) 3918 if test -z "$sdk_found"; then |
| 3919 sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx11.(0|1)" | sed -e "s/.*sdk //" | tail -n1` | 3919 sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx11.(0|1|2|3)" | sed -e "s/.*sdk //" | tail -n1` |
| 3920 fi | 3920 fi |
| 3921 dnl If not found, look for macOS12.x SDKs (Xcode 13.0 and later) |
|
| 3921 if test -z "$sdk_found"; then | 3922 if test -z "$sdk_found"; then |
| 3923 sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx12.(0|1|2)" | sed -e "s/.*sdk //" | tail -n1` 3924 fi 3925 if test -z "$sdk_found"; then |
|
| 3922 AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found]) 3923 else 3924 AC_MSG_RESULT([yes, by using SDK $sdk_found]) 3925 fi 3926 sdk_path=`xcodebuild -version -sdk ${sdk_found} Path` 3927 elif test ! -d "$sdk_path"; then 3928 sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx${sdk_path}" | sed -e "s/.*sdk //" | tail -n1` 3929 if test -z "$sdk_found"; then --- 3574 unchanged lines hidden --- | 3926 AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found]) 3927 else 3928 AC_MSG_RESULT([yes, by using SDK $sdk_found]) 3929 fi 3930 sdk_path=`xcodebuild -version -sdk ${sdk_found} Path` 3931 elif test ! -d "$sdk_path"; then 3932 sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx${sdk_path}" | sed -e "s/.*sdk //" | tail -n1` 3933 if test -z "$sdk_found"; then --- 3574 unchanged lines hidden --- |