diff options
| author |  Yilun Chong <chongyilun250@sina.com> | 2018-07-09 13:57:55 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-07-09 13:57:55 -0700 |
| commit | 5524c53e602828430da9e7b405135c0961e868da (patch) | |
| tree | 0476e0c98832dc094d6300fb60d003b14749daa7 | |
| parent | 4129b6aaad1aa9d48dea1b4ad64c2a64747cb537 (diff) | |
| parent | 82b490f6fd8408eb6a2d2091dc8be1057876d06d (diff) | |
Merge pull request #4876 from BSBandme/fix_cpp_benchmark
Fix cpp benchmark dependency on mac
| -rw-r--r-- | benchmarks/Makefile.am | 1 | ||||
| -rw-r--r-- | conformance/Makefile.am | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am index 9f609228..b6521740 100644 --- a/benchmarks/Makefile.am +++ b/benchmarks/Makefile.am @@ -109,6 +109,7 @@ cpp_benchmark_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir)/cpp -I$(top_srcdir)/thi # so a direct "make test_cpp" could fail if parallel enough. # See: https://www.gnu.org/software/automake/manual/html_node/Built-Sources-Example.html#Recording-Dependencies-manually cpp/cpp_benchmark-cpp_benchmark.$(OBJEXT): $(benchmarks_protoc_outputs) $(benchmarks_protoc_outputs_proto2) $(benchmarks_protoc_outputs_header) $(benchmarks_protoc_outputs_proto2_header) $(top_srcdir)/src/libprotobuf.la $(top_srcdir)/third_party/benchmark/src/libbenchmark.a +cpp/benchmark-cpp_benchmark.$(OBJEXT): $(benchmarks_protoc_outputs) $(benchmarks_protoc_outputs_proto2) $(benchmarks_protoc_outputs_header) $(benchmarks_protoc_outputs_proto2_header) $(top_srcdir)/src/libprotobuf.la $(top_srcdir)/third_party/benchmark/src/libbenchmark.a nodist_cpp_benchmark_SOURCES = \ $(benchmarks_protoc_outputs) \ $(benchmarks_protoc_outputs_proto2) \ diff --git a/conformance/Makefile.am b/conformance/Makefile.am index 765f3588..e51ab80a 100644 --- a/conformance/Makefile.am +++ b/conformance/Makefile.am @@ -279,8 +279,6 @@ $(protoc_outputs): protoc_middleman $(other_language_protoc_outputs): protoc_middleman -BUILT_SOURCES = $(protoc_outputs) $(other_language_protoc_outputs) - CLEANFILES = $(protoc_outputs) protoc_middleman javac_middleman conformance-java javac_middleman_lite conformance-java-lite conformance-csharp conformance-php conformance-php-c $(other_language_protoc_outputs) MAINTAINERCLEANFILES = \ |