From 23ce1b864201f0229ce04b5e25cf44ba8834b972 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Fri, 2 Aug 2019 05:48:32 +0000 Subject: [PATCH] platform.mk / defs.mk fix: SHELL was referenced before definition SHELL defaults to /bin/sh on Ubuntu 16, and was used to get-os.sh, which fails Signed-off-by: Jan Lindemann --- make/defs.mk | 6 ------ make/platform.mk | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index 9962c5cf..7ffbd12b 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -15,12 +15,6 @@ comma := , include $(JWBDIR)/make/projects.mk -ifeq ($(MAKE_BENCHMARK),true) - export SHELL := /bin/bash $(JWB_SCRIPT_DIR)/timed-make-shell.sh -else - export SHELL := /bin/bash -endif - ifndef GREP GREP := $(shell $(WHICH) grep) endif diff --git a/make/platform.mk b/make/platform.mk index dc7a3b52..c663da96 100644 --- a/make/platform.mk +++ b/make/platform.mk @@ -16,6 +16,12 @@ $(eval $(call try_include,$(JWBDIR)/make/pre-local.mk)) $(eval $(call try_include,$(TOPDIR)/make/pre-local.mk)) $(eval $(call try_include,pre-local.mk)) +ifeq ($(MAKE_BENCHMARK),true) + export SHELL := /bin/bash $(JWB_SCRIPT_DIR)/timed-make-shell.sh +else + export SHELL := /bin/bash +endif + JWB_SCRIPT_DIR := $(firstword $(wildcard $(JWBDIR)/scripts $(JWBDIR)/bin)) ifndef GET_OS_SH GET_OS_SH := $(SHELL) $(JWB_SCRIPT_DIR)/get-os.sh