vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Jan 27 09:48:26 2019 +0200| [848eaf76791e9a81837b849c688cd72eef4703b3] | committer: Rémi Denis-Courmont
contrib: protoc: do not break the whole build So what if protoc does not matc? I should still be able to build almost everything that does not depend on this crapware. Regression from d45bc25e13898aeb0096b933572a9d4d9f30f590. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=848eaf76791e9a81837b849c688cd72eef4703b3 --- contrib/src/protobuf/rules.mak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/src/protobuf/rules.mak b/contrib/src/protobuf/rules.mak index 3c6d6b489b..19abe5d53a 100644 --- a/contrib/src/protobuf/rules.mak +++ b/contrib/src/protobuf/rules.mak @@ -10,13 +10,13 @@ ifeq ($(findstring protobuf,$(PKGS_DISABLE)),) # check we have a matching protoc to use PROTOC = $(shell PATH="$(PATH)" which protoc) ifeq ($(PROTOC),) -$(error protoc not found in PATH $(PATH) - $(SYS_PROTOC) - $(PROTOC)) +PROTOC = $(error protoc not found in PATH $(PATH) - $(SYS_PROTOC) - $(PROTOC)) else # make sure the installed protoc is compatible with the version we want to build SYS_PROTOC_VER = $(shell $(PROTOC) --version) SYS_PROTOC = $(word $(words $(SYS_PROTOC_VER)) , $(SYS_PROTOC_VER)) ifneq ($(PROTOBUF_VERSION),$(SYS_PROTOC)) -$(error $(PROTOC) version $(SYS_PROTOC) doesn't match the protobuf $(PROTOBUF_VERSION) we're building) +PROTOC = $(error $(PROTOC) version $(SYS_PROTOC) doesn't match the protobuf $(PROTOBUF_VERSION) we're building) endif endif endif _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
