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

changes/57/2357/1
zuul 9 years ago committed by Gerrit Code Review
commit ee5a9442a2

@ -1,25 +1,24 @@
ifeq ($(NOISY_BUILD),) ifeq ($(NOISY_BUILD),)
SUBMAKE?=$(MAKE) --quiet --no-print-directory SUBMAKE?=$(MAKE) --quiet --no-print-directory
ECHO_PREFIX?=@ ECHO_PREFIX?=@
CMD_PREFIX?=@ CMD_PREFIX?=@
QUIET_CONFIGURE=-q QUIET_CONFIGURE=-q
REALLY_QUIET=&>/dev/null REALLY_QUIET=&>/dev/null
else else
SUBMAKE?=$(MAKE) SUBMAKE?=$(MAKE)
ECHO_PREFIX?=@\# ECHO_PREFIX?=@\#
CMD_PREFIX?= CMD_PREFIX?=
QUIET_CONFIGURE= QUIET_CONFIGURE=
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
ifeq ($(DOWNLOAD),) ifeq ($(DOWNLOAD),)

Loading…
Cancel
Save