Re-Revert "Merge branch 'staging-next'"

This reverts commit f8a8fc6c7c.
2019-09-22 09:38:09 +02:00
parent 415b29939b
commit 22a216849b
90 changed files with 428 additions and 367 deletions
@@ -7,7 +7,7 @@ index afadf53..80b7533 100644
     # "ProductVersion:    10.10.5"   "10.10"
     # "ProductVersion:    10.11"     "10.11"
 -        prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
-+        prodvers="10.10"
+        prodvers="${MACOSX_DEPLOYMENT_TARGET:-10.12}"
     case "$prodvers" in
     10.*)
       add_macosx_version_min ccflags $prodvers