diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2015-04-24 17:44:50 -0700 |
|---|---|---|
| committer | Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2015-04-24 17:44:50 -0700 |
| commit | 1eef5aa1ebad6a125bdc7b1ff8082ab5cbd8dc5b (patch) | |
| tree | 27222fe47e9144fc005f94e672cd39672fb7fb94 /templates/Makefile.template | |
| parent | eae6973b00b45faf2c33604ad513000716092dd9 (diff) | |
| parent | f5fcafde8108089b67ecd3f06d4c119b5b2751ad (diff) | |
Merge pull request #1368 from dgquintas/mkfile_proto_cmd_fix
Renamed make variables for protoc presence and version checking.
Diffstat (limited to 'templates/Makefile.template')
| -rw-r--r-- | templates/Makefile.template | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index ab137a8657..e51af39348 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -362,8 +362,8 @@ OPENSSL_ALPN_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/ope ZLIB_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/zlib.c -lz $(LDFLAGS) PERFTOOLS_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/perftools.c -lprofiler $(LDFLAGS) PROTOBUF_CHECK_CMD = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/protobuf.cc -lprotobuf $(LDFLAGS) -PROTOC_CMD = which protoc > /dev/null -PROTOC_CHECK_CMD = protoc --version | grep -q libprotoc.3 +PROTOC_CHECK_CMD = which protoc > /dev/null +PROTOC_CHECK_VERSION_CMD = protoc --version | grep -q libprotoc.3 ifeq ($(OPENSSL_REQUIRES_DL),true) OPENSSL_ALPN_CHECK_CMD += -ldl @@ -389,9 +389,9 @@ HAS_SYSTEM_ZLIB = false HAS_SYSTEM_PROTOBUF = false endif -HAS_PROTOC = $(shell $(PROTOC_CMD) 2> /dev/null && echo true || echo false) +HAS_PROTOC = $(shell $(PROTOC_CHECK_CMD) 2> /dev/null && echo true || echo false) ifeq ($(HAS_PROTOC),true) -HAS_VALID_PROTOC = $(shell $(PROTOC_CHECK_CMD) 2> /dev/null && echo true || echo false) +HAS_VALID_PROTOC = $(shell $(PROTOC_CHECK_VERSION_CMD) 2> /dev/null && echo true || echo false) else HAS_VALID_PROTOC = false endif @@ -587,7 +587,7 @@ run_dep_checks: $(ZLIB_CHECK_CMD) || true $(PERFTOOLS_CHECK_CMD) || true $(PROTOBUF_CHECK_CMD) || true - $(PROTOC_CHECK_CMD) || true + $(PROTOC_CHECK_VERSION_CMD) || true $(LIBDIR)/$(CONFIG)/zlib/libz.a: $(E) "[MAKE] Building zlib" |