Merge "third_party/Makefile.rules: Replace unsupported != operator with $(shell ...)" into 13

This commit is contained in:
zuul
2016-03-04 07:04:13 -06:00
committed by Gerrit Code Review

View File

@@ -13,12 +13,11 @@ else
REALLY_QUIET= REALLY_QUIET=
endif endif
DOWNLOAD := DOWNLOAD := $(shell which wget 2>/dev/null)
DOWNLOAD != which wget 2>/dev/null
DOWNLOAD := $(if $(DOWNLOAD),$(DOWNLOAD) -O- ,) DOWNLOAD := $(if $(DOWNLOAD),$(DOWNLOAD) -O- ,)
ifeq ($(DOWNLOAD),) ifeq ($(DOWNLOAD),)
DOWNLOAD != which curl 2>/dev/null DOWNLOAD := $(shell which curl 2>/dev/null)
DOWNLOAD := $(if $(DOWNLOAD), $(DOWNLOAD) -L ,) DOWNLOAD := $(if $(DOWNLOAD), $(DOWNLOAD) -L ,)
endif endif