From 3f4c72c60793ca6ada24ae85c3211b2ab178eb3b Mon Sep 17 00:00:00 2001 From: Kurt Van Dijck Date: Sun, 19 Jun 2016 06:12:06 +0200 Subject: [PATCH] build: fix umask test Some shells' builtin umask does not print 2 leading 0's for the umask. Switching to bash is done anyway. This patch switches to bash before the umask test. Signed-off-by: Kurt Van Dijck Signed-off-by: Peter Korsgaard --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 3f5c3d3b2f..78b44c5e4b 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,11 @@ # You shouldn't need to mess with anything beyond this point... #-------------------------------------------------------------- +# we want bash as shell +SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ + else if [ -x /bin/bash ]; then echo /bin/bash; \ + else echo sh; fi; fi) + # Trick for always running with a fixed umask UMASK = 0022 ifneq ($(shell umask),$(UMASK)) @@ -227,11 +232,6 @@ else Q = @ endif -# we want bash as shell -SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ - else if [ -x /bin/bash ]; then echo /bin/bash; \ - else echo sh; fi; fi) - # kconfig uses CONFIG_SHELL CONFIG_SHELL := $(SHELL)