aboutsummaryrefslogtreecommitdiff
path: root/objectivec
diff options
context:
space:
mode:
authorThomas Van Lenten <thomasvl@google.com>2015-12-02 13:34:05 -0500
committerThomas Van Lenten <thomasvl@google.com>2015-12-02 13:34:05 -0500
commit764a2248ccaca942ab15e69c456bbe87cb5a45b1 (patch)
tree87bd108c0130abc5bfb68ac3b39b67088cb31e8c /objectivec
parente4af879ba24f73379f6efc52d8d7e0154ad2ce2e (diff)
parent69d713fc3c941c9f266358c4fb12c8c2bc5d1c85 (diff)
downloadprotobuf-764a2248ccaca942ab15e69c456bbe87cb5a45b1.tar.gz
protobuf-764a2248ccaca942ab15e69c456bbe87cb5a45b1.tar.bz2
protobuf-764a2248ccaca942ab15e69c456bbe87cb5a45b1.zip
Merge pull request #1019 from thomasvl/correct_conformance_compile
Ensure the conformance build of objc code is using the Mac OS X SDK
Diffstat (limited to 'objectivec')
-rwxr-xr-xobjectivec/DevTools/full_mac_build.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/objectivec/DevTools/full_mac_build.sh b/objectivec/DevTools/full_mac_build.sh
index 251f2599..11e3f79b 100755
--- a/objectivec/DevTools/full_mac_build.sh
+++ b/objectivec/DevTools/full_mac_build.sh
@@ -136,7 +136,9 @@ fi
if [[ "${DO_AUTOGEN}" == "yes" ]] ; then
header "Running autogen & configure"
./autogen.sh
- ./configure CXXFLAGS="-mmacosx-version-min=10.9 -Wnon-virtual-dtor -Woverloaded-virtual -Wunused-const-variable -Wunused-function"
+ ./configure \
+ CPPFLAGS="-mmacosx-version-min=10.9 -Wunused-const-variable -Wunused-function" \
+ CXXFLAGS="-Wnon-virtual-dtor -Woverloaded-virtual"
fi
if [[ "${DO_CLEAN}" == "yes" ]] ; then