diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-06-18 13:24:15 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-06-18 13:24:15 -0700 |
| commit | 52c6142a30fc74d665bf6d7270c0d6835a9db38f (patch) | |
| tree | 79dfb91737924ece5106c8b9d43478d841d45048 /templates | |
| parent | 6174b9a4d092c145d6cd3c90ab59bf5a0939329e (diff) | |
| parent | a15f08cc9a8004785ec937b2ee06951b600d87b6 (diff) | |
Merge github.com:grpc/grpc into we-dont-need-no-backup
Conflicts:
gRPC.podspec
tools/doxygen/Doxyfile.core.internal
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/gRPC.podspec.template | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/templates/gRPC.podspec.template b/templates/gRPC.podspec.template index 84716c81e1..c5513f1d44 100644 --- a/templates/gRPC.podspec.template +++ b/templates/gRPC.podspec.template @@ -66,7 +66,6 @@ Pod::Spec.new do |s| # details of Cocoapods, and have changed in the past, breaking this podspec. cs.xcconfig = { 'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/Headers/Private/gRPC" ' + '"$(PODS_ROOT)/Headers/Private/gRPC/include"' } - cs.compiler_flags = '-GCC_WARN_INHIBIT_ALL_WARNINGS', '-w' cs.requires_arc = false cs.libraries = 'z' |