janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-28 15:52:49 +01:00
Code Activity

platform.mk / defs.mk fix: SHELL was referenced before definition

Browse source 
SHELL defaults to /bin/sh on Ubuntu 16, and was used to get-os.sh, which fails

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-08-02 05:48:32 +00:00
commit 23ce1b8642
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
make/defs.mk
View file

@ -15,12 +15,6 @@ comma := ,
include $(JWBDIR)/make/projects.mk 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 ifndef GREP
GREP := $(shell $(WHICH) grep) GREP := $(shell $(WHICH) grep)
endif endif

6
make/platform.mk
View file

@ -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,$(TOPDIR)/make/pre-local.mk))
$(eval $(call try_include,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)) JWB_SCRIPT_DIR := $(firstword $(wildcard $(JWBDIR)/scripts $(JWBDIR)/bin))
ifndef GET_OS_SH ifndef GET_OS_SH
GET_OS_SH := $(SHELL) $(JWB_SCRIPT_DIR)/get-os.sh GET_OS_SH := $(SHELL) $(JWB_SCRIPT_DIR)/get-os.sh