[X2Go-Commits] [x2goclient] 01/07: macbuild.sh: only use --stdlib compiler flag on 10.7+. Unsupported on 10.6 and below.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/cleanup
in repository x2goclient.

commit bf12092eb45cebe40c3bd05b60d97f4048d6fb7a
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Feb 18 02:46:02 2015 +0100

    macbuild.sh: only use --stdlib compiler flag on 10.7+. Unsupported on 10.6 and below.
---
 debian/changelog |    1 +
 macbuild.sh      |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 15a271a..b84512e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -220,6 +220,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium
       fixing...
     - Remove config_mac.sh. macbuild.sh handles this now.
     - Use the correct client build dir in macbuild.sh: client_build.
+    - Only use --stdlib compiler flag on 10.7+. Unsupported on 10.6 and below.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 27 Nov 2014 12:01:43 +0100
 
diff --git a/macbuild.sh b/macbuild.sh
index 9263d26..35bdb48 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -30,7 +30,7 @@ SDK_MINOR_VERSION="$(/usr/bin/perl -pe 's#.*?10\.(\d+).*?\.sdk$#\1#' <<< "${SDK}
 
 MATCH_NUMBERS='^[0-9]+$'
 if [[ "${SDK_MINOR_VERSION}" =~ ${MATCH_NUMBERS} ]]; then
-	STDLIB="libstdc++"
+	[ "${SDK_MINOR_VERSION}" -gt "6" ] && STDLIB="libstdc++"
 	[ "${SDK_MINOR_VERSION}" -gt "8" ] && STDLIB="libc++"
 else
 	echo "Unable to determine OS X version. Unknown value '${SDK_MINOR_VERSION}'." >&2

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git