File tree 3 files changed +31
-2
lines changed 3 files changed +31
-2
lines changed Original file line number Diff line number Diff line change 890
890
29B97313FDCFA39411CA2CEA /* Project object */ = {
891
891
isa = PBXProject;
892
892
attributes = {
893
+ BuildIndependentTargetsInParallel = YES;
893
894
LastUpgradeCheck = 0710;
894
895
};
895
896
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MacVim" */;
Original file line number Diff line number Diff line change @@ -4792,7 +4792,21 @@ rm -f core conftest.err conftest.$ac_objext \
4792
4792
conftest$ac_exeext conftest.$ac_ext
4793
4793
else
4794
4794
if test -z " $MACOSX_DEPLOYMENT_TARGET " ; then
4795
- macosx_deployment_target=` /usr/bin/sw_vers -productVersion| /usr/bin/sed -e ' s/^\([0-9]*\.[0-9]*\).*/\1/' `
4795
+ # Deployment target not specified. We use the current OS' version. We
4796
+ # only want to extract the main OS version but not the minor version for
4797
+ # multiple reasons: it's more predictable if this is built from a CI to
4798
+ # be deployed out (e.g. Homebrew), and sometimes deployment target
4799
+ # that is too new will cause Xcode to complain (e.g. macOS is 13.2 while
4800
+ # Xcode may only support up to 13.1)
4801
+ macosx_major_version=` /usr/bin/sw_vers -productVersion| /usr/bin/sed -e ' s/^\([0-9]*\)\.[0-9]*.*/\1/' `
4802
+ macosx_minor_version=` /usr/bin/sw_vers -productVersion| /usr/bin/sed -e ' s/^[0-9]*\.\([0-9]*\).*/\1/' `
4803
+ if test " $macosx_major_version " = " 10" ; then
4804
+ # Older versions look like 10.X.Y form where X is the main version.
4805
+ macosx_deployment_target=" $macosx_major_version .$macosx_minor_version "
4806
+ else
4807
+ # Since 11.0, We have X.Y.Z, where X is the main version.
4808
+ macosx_deployment_target=" $macosx_major_version .0"
4809
+ fi
4796
4810
XCODEFLAGS=" $XCODEFLAGS MACOSX_DEPLOYMENT_TARGET=$macosx_deployment_target "
4797
4811
else
4798
4812
XCODEFLAGS=" $XCODEFLAGS MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET "
Original file line number Diff line number Diff line change @@ -298,7 +298,21 @@ if test "$vim_cv_uname_output" = Darwin; then
298
298
LDFLAGS="$save_ldflags" ] )
299
299
else
300
300
if test -z "$MACOSX_DEPLOYMENT_TARGET"; then
301
- macosx_deployment_target=`/usr/bin/sw_vers -productVersion|/usr/bin/sed -e 's/^\([ [ 0-9] ] *\.[ [ 0-9] ] *\).*/\1/'`
301
+ # Deployment target not specified. We use the current OS' version. We
302
+ # only want to extract the main OS version but not the minor version for
303
+ # multiple reasons: it's more predictable if this is built from a CI to
304
+ # be deployed out (e.g. Homebrew), and sometimes deployment target
305
+ # that is too new will cause Xcode to complain (e.g. macOS is 13.2 while
306
+ # Xcode may only support up to 13.1)
307
+ macosx_major_version=`/usr/bin/sw_vers -productVersion|/usr/bin/sed -e 's/^\([ [ 0-9] ] *\)\.[ [ 0-9] ] *.*/\1/'`
308
+ macosx_minor_version=`/usr/bin/sw_vers -productVersion|/usr/bin/sed -e 's/^[ [ 0-9] ] *\.\([ [ 0-9] ] *\).*/\1/'`
309
+ if test "$macosx_major_version" = "10"; then
310
+ # Older versions look like 10.X.Y form where X is the main version.
311
+ macosx_deployment_target="$macosx_major_version.$macosx_minor_version"
312
+ else
313
+ # Since 11.0, We have X.Y.Z, where X is the main version.
314
+ macosx_deployment_target="$macosx_major_version.0"
315
+ fi
302
316
XCODEFLAGS="$XCODEFLAGS MACOSX_DEPLOYMENT_TARGET=$macosx_deployment_target"
303
317
else
304
318
XCODEFLAGS="$XCODEFLAGS MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET"
You can’t perform that action at this time.
0 commit comments