From aadc6422eaec39c22e4b4ce00a1e3ff619c41154 Mon Sep 17 00:00:00 2001
From: Adam Hartley <git@ahartley.com>
Date: Mon, 6 Jul 2020 22:59:42 +0100
Subject: [PATCH] Add 11.x support for darwin.sh
---
hints/darwin.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hints/darwin.sh b/hints/darwin.sh
index 0a91bc083c0..c0f06de1cab 100644
--- a/hints/darwin.sh
+++ b/hints/darwin.sh
@@ -301,7 +301,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
# We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
# capturing its value and adding it to the flags.
case "$MACOSX_DEPLOYMENT_TARGET" in
- 10.*)
+ 10.* | 11.*)
add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
;;
@@ -327,7 +327,7 @@ EOM
# "ProductVersion: 10.11" "10.11"
prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
case "$prodvers" in
- 10.*)
+ 10.* | 11.*)
add_macosx_version_min ccflags $prodvers
add_macosx_version_min ldflags $prodvers
;;
From 4603d7dabf1b5f331d23c95d70b16e656c8124b0 Mon Sep 17 00:00:00 2001
From: Adam Hartley <git@ahartley.com>
Date: Wed, 8 Jul 2020 19:10:33 +0100
Subject: [PATCH] Update error message
---
hints/darwin.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hints/darwin.sh b/hints/darwin.sh
index c0f06de1cab4..988b766c4f4a 100644
--- a/hints/darwin.sh
+++ b/hints/darwin.sh
@@ -313,7 +313,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
*** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
***
-*** Please either set it to 10.something, or to empty.
+*** Please either set it to 10.something, 11.something or to empty.
EOM
exit 1
From 54d41b60822734cf8df543053f7bd270dfded3ed Mon Sep 17 00:00:00 2001
From: Adam Hartley <BytesGuy@users.noreply.github.com>
Date: Thu, 23 Jul 2020 19:53:07 +0100
Subject: [PATCH] Future proof version check
---
hints/darwin.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hints/darwin.sh b/hints/darwin.sh
index 1709d224f7c8..fdfbdd4a3b94 100644
--- a/hints/darwin.sh
+++ b/hints/darwin.sh
@@ -301,7 +301,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
# We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
# capturing its value and adding it to the flags.
case "$MACOSX_DEPLOYMENT_TARGET" in
- 10.* | 11.*)
+ [1-9][0-9].*)
add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
;;
@@ -313,7 +313,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
*** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
***
-*** Please either set it to 10.something, 11.something or to empty.
+*** Please either set it to a valid macOS version number (e.g., 10.15) or to empty.
EOM
exit 1
@@ -327,7 +327,7 @@ EOM
# "ProductVersion: 10.11" "10.11"
prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
case "$prodvers" in
- 10.* | 11.*)
+ [1-9][0-9].*)
add_macosx_version_min ccflags $prodvers
add_macosx_version_min ldflags $prodvers
;;