diff options
| author |  murgatroid99 <mlumish@google.com> | 2015-08-11 17:28:42 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2015-08-11 17:28:42 -0700 |
| commit | 9e2b7c81b10f79085df25a27fd2ab4b37e7d00e5 (patch) | |
| tree | 6a98eedeb3353289bee6ea5b44af8cbb62e031fa /src/objective-c/generated_libraries/RouteGuideClient/RouteGuide.podspec | |
| parent | a16b5ef455c63a18929b4ef90945e90f01c1fd58 (diff) | |
| parent | 9a2a3aecc8f7d667df0236df0367bb59a4ae37b1 (diff) | |
Resolved merge conflicts with master
Diffstat (limited to 'src/objective-c/generated_libraries/RouteGuideClient/RouteGuide.podspec')
| -rw-r--r-- | src/objective-c/generated_libraries/RouteGuideClient/RouteGuide.podspec | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/objective-c/generated_libraries/RouteGuideClient/RouteGuide.podspec b/src/objective-c/generated_libraries/RouteGuideClient/RouteGuide.podspec index 2c9cead7cf..23ccffe69d 100644 --- a/src/objective-c/generated_libraries/RouteGuideClient/RouteGuide.podspec +++ b/src/objective-c/generated_libraries/RouteGuideClient/RouteGuide.podspec @@ -8,7 +8,10 @@ Pod::Spec.new do |s| # Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients. s.prepare_command = <<-CMD - protoc --plugin=protoc-gen-grpc=../../../../bins/$CONFIG/grpc_objective_c_plugin --objc_out=. --grpc_out=. *.proto + BINDIR=../../../../bins/$CONFIG + PROTOC=$BINDIR/protobuf/protoc + PLUGIN=$BINDIR/grpc_objective_c_plugin + $PROTOC --plugin=protoc-gen-grpc=$PLUGIN --objc_out=. --grpc_out=. *.proto CMD s.subspec "Messages" do |ms| |