commit e7b7d86fde3475978c3f7d4dfaabaf549152cd02
author Jan Tattermusch <jan.tattermusch@gmail.com> Fri Feb 19 09:49:35 2016 -0800
committer Jan Tattermusch <jtattermusch@google.com> Fri Feb 19 13:20:50 2016 -0800
tree 6024836540238a36bd4b641c321a8f9a70139596
parent e046f712c5ed1723972af41c1ff402a33d538e29

fix protoc artifact build on mac

tools/run_tests/artifact_targets.py

diff --git a/tools/run_tests/artifact_targets.py b/tools/run_tests/artifact_targets.py
index 3933564..5d678a5 100644
--- a/tools/run_tests/artifact_targets.py
+++ b/tools/run_tests/artifact_targets.py
@@ -248,7 +248,9 @@
   def build_jobspec(self):
     if self.platform != 'windows':
       cxxflags = '-DNDEBUG %s' % _ARCH_FLAG_MAP[self.arch]
-      ldflags = ' -static-libgcc -static-libstdc++ -s %s' % _ARCH_FLAG_MAP[self.arch]
+      ldflags = '%s' % _ARCH_FLAG_MAP[self.arch]
+      if self.platform != 'macos':
+        ldflags += ' -static-libgcc -static-libstdc++ -s'
       environ={'CONFIG': 'opt',
                'CXXFLAGS': cxxflags,
                'LDFLAGS': ldflags,
@@ -259,7 +261,7 @@
             'tools/run_tests/build_artifact_protoc.sh',
             environ=environ)
       else:
-        environ['CXXFLAGS'] += ' %s' % _MACOS_COMPAT_FLAG
+        environ['CXXFLAGS'] += ' -std=c++11 -stdlib=libc++ %s' % _MACOS_COMPAT_FLAG
         return create_jobspec(self.name,
             ['tools/run_tests/build_artifact_protoc.sh'],
             environ=environ)