Makefile: fix shell error for darwin major/minor version check
PATCH 1/1 Makefile: fix shell error for darwin major/minor version check
Fix shell error:
/bin/sh: line 0: [: too many arguments
for the darwin major/minor version check.
It seems for os_x_before for some reason DARWIN_MAJOR_VERSION and DARWIN_MINOR_VERSION are empty. To fix this set DARWIN_MAJOR_VERSION and DARWIN_MINOR_VERSION to be evaluated once so the value is retained.
--- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Makefile +2 -2
@@ -318,8 +318,8 @@ endif # ifeq ($(HOSTOS),darwin) # get major and minor product version (e.g. '10' and '6' for Snow Leopard) -DARWIN_MAJOR_VERSION = $(shell sw_vers -productVersion | cut -f 1 -d '.') -DARWIN_MINOR_VERSION = $(shell sw_vers -productVersion | cut -f 2 -d '.') +DARWIN_MAJOR_VERSION := $(shell sw_vers -productVersion | cut -f 1 -d '.') +DARWIN_MINOR_VERSION := $(shell sw_vers -productVersion | cut -f 2 -d '.') os_x_before = $(shell if [ $(DARWIN_MAJOR_VERSION) -le $(1) -a \ $(DARWIN_MINOR_VERSION) -le $(2) ] ; then echo "$(3)"; else echo "$(4)"; fi ;)
Signature · 1 line
2.38.1
Quoted 6 lines · Christian Marangi
Fix shell error:
/bin/sh: line 0: [: too many argumentsfor the darwin major/minor version check.
Quoted 9 lines
It seems for
os_x_beforefor some reasonDARWIN_MAJOR_VERSIONandDARWIN_MINOR_VERSIONare empty. To fix this setDARWIN_MAJOR_VERSIONandDARWIN_MINOR_VERSIONto be evaluated once so the value is retained.Signed-off-by Christian Marangi <[email protected]>--- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 11 lines · Christian Marangi
Fix shell error:
/bin/sh: line 0: [: too many argumentsfor the darwin major/minor version check.
It seems for
os_x_beforefor some reasonDARWIN_MAJOR_VERSIONandDARWIN_MINOR_VERSIONare empty. To fix this setDARWIN_MAJOR_VERSIONandDARWIN_MINOR_VERSIONto be evaluated once so the value is retained.Signed-off-by Christian Marangi <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom