From 97eeb71581ce16adc2ba80edee103b8ec0ff2b52 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Wed, 31 Mar 2021 04:18:31 -0700
Subject: [PATCH] Mac build script: eliminate redundant -c++11 arg since C++11
 build is now standard

---
 mac_build/BuildMacBOINC.sh | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/mac_build/BuildMacBOINC.sh b/mac_build/BuildMacBOINC.sh
index 2b1bfcd467..a0bace0686 100644
--- a/mac_build/BuildMacBOINC.sh
+++ b/mac_build/BuildMacBOINC.sh
@@ -33,6 +33,7 @@
 # Updated 10/17/17 to fix bug when -all argument is implied but not explicitly passed
 # Updated 10/19/17 Special handling of screensaver build is no longer needed
 # Updated 10/14/18 for Xcode 10 (use this script only with BOINC 7.15 or later)
+# Updated 3/31/21 To eliminate redundant -c++11 arg since C++11 build is now standard
 #
 ## This script requires OS 10.8 or later
 #
@@ -46,10 +47,10 @@
 ##     cd [path]/boinc/mac_build
 ##
 ## then invoke this script as follows:
-##      source BuildMacBOINC.sh [-dev] [-noclean] [-libstdc++] [-c++11] [-all] [-lib] [-client] [-target targetName] [-setting name value] [-help]
+##      source BuildMacBOINC.sh [-dev] [-noclean] [-libstdc++] [-all] [-lib] [-client] [-target targetName] [-setting name value] [-help]
 ## or
 ##      chmod +x BuildMacBOINC.sh
-##      ./BuildMacBOINC.sh [-dev] [-noclean] [-libstdc++] [-c++11] [-all] [-lib] [-client] [-target targetName] [-setting name value] [-help]
+##      ./BuildMacBOINC.sh [-dev] [-noclean] [-libstdc++] [-all] [-lib] [-client] [-target targetName] [-setting name value] [-help]
 ##
 ## optional arguments
 ## -dev         build the development (debug) version.
@@ -60,7 +61,6 @@
 ##
 ## -libstdc++   build using libstdc++ instead of libc++
 ##
-## -c++11       build using c++11 language dialect instead of default (incompatible with libstdc++)
 ##
 ##  The following arguments determine which targets to build
 ##
@@ -84,7 +84,6 @@
 
 targets=""
 doclean="clean"
-cplusplus11dialect=""
 uselibcplusplus=""
 buildall=0
 buildlibs=0
@@ -98,7 +97,6 @@ while [ $# -gt 0 ]; do
     -noclean ) doclean="" ; shift 1 ;;
     -dev ) style="Development" ; shift 1 ;;
     -libstdc++ ) uselibcplusplus="CLANG_CXX_LIBRARY=libstdc++" ; shift 1 ;;
-    -c++11 ) cplusplus11dialect="CLANG_CXX_LANGUAGE_STANDARD=c++11" ; shift 1 ;;
     -all ) buildall=1 ; shift 1 ;;
     -lib ) buildlibs=1 ; shift 1 ;;
     -client ) buildclient=1 ; shift 1 ;;
@@ -163,7 +161,7 @@ echo ""
 SDKPATH=`xcodebuild -version -sdk macosx Path`
 result=0
 
-xcodebuild -project boinc.xcodeproj ${targets} -configuration ${style} -sdk "${SDKPATH}" ${doclean} build ${uselibcplusplus} ${cplusplus11dialect} "${settings[@]}"
+xcodebuild -project boinc.xcodeproj ${targets} -configuration ${style} -sdk "${SDKPATH}" ${doclean} build ${uselibcplusplus} "${settings[@]}"
 result=$?
 
 if [ $result -eq 0 ]; then
@@ -171,7 +169,7 @@ if [ $result -eq 0 ]; then
     # default is none of { -all, -lib, -client }
     if [ "${buildall}" = "1" ] || [ "${buildlibs}" = "1" ] || [ "${buildclient}" = "0" ]; then
         if [ "${buildzip}" = "1" ]; then
-            xcodebuild -project ../zip/boinc_zip.xcodeproj -target boinc_zip -configuration ${style} -sdk "${SDKPATH}" ${doclean} build  ${uselibcplusplus} ${cplusplus11dialect}
+            xcodebuild -project ../zip/boinc_zip.xcodeproj -target boinc_zip -configuration ${style} -sdk "${SDKPATH}" ${doclean} build  ${uselibcplusplus}
             result=$?
         fi
     fi