diff options
| author | Thomas Van Lenten <thomasvl@google.com> | 2015-12-02 11:48:14 -0500 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2015-12-02 11:48:14 -0500 |
| commit | 69d713fc3c941c9f266358c4fb12c8c2bc5d1c85 (patch) | |
| tree | 87bd108c0130abc5bfb68ac3b39b67088cb31e8c | |
| parent | e4af879ba24f73379f6efc52d8d7e0154ad2ce2e (diff) | |
| download | protobuf-69d713fc3c941c9f266358c4fb12c8c2bc5d1c85.tar.gz protobuf-69d713fc3c941c9f266358c4fb12c8c2bc5d1c85.tar.bz2 protobuf-69d713fc3c941c9f266358c4fb12c8c2bc5d1c85.zip | |
Ensure the conformance build of objc code is using the Mac OS X SDK and
| -rw-r--r-- | conformance/Makefile.am | 6 | ||||
| -rwxr-xr-x | objectivec/DevTools/full_mac_build.sh | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/conformance/Makefile.am b/conformance/Makefile.am index d7bb9397..ea5edbba 100644 --- a/conformance/Makefile.am +++ b/conformance/Makefile.am @@ -38,7 +38,11 @@ bin_PROGRAMS += conformance-objc conformance_objc_SOURCES = conformance_objc.m ../objectivec/GPBProtocolBuffers.m nodist_conformance_objc_SOURCES = Conformance.pbobjc.m -conformance_objc_CPPFLAGS = -I$(top_srcdir)/objectivec +# On travis, the build fails without the isysroot because whatever system +# headers are being found don't include generics support for +# NSArray/NSDictionary, the only guess is their image at one time had an odd +# setup for Xcode and old frameworks are being found. +conformance_objc_CPPFLAGS = -I$(top_srcdir)/objectivec -isysroot `xcrun --sdk macosx --show-sdk-path` conformance_objc_LDFLAGS = -framework Foundation # Explicit dep beacuse BUILT_SOURCES are only done before a "make all/check" # so a direct "make test_objc" could fail if parallel enough. 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 |