janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

defs.mk: Fix MAKE_BENCHMARK support

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-02-27 14:49:05 +00:00
commit e16b4c6d82
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
make/defs.mk
View file

@ -5,15 +5,15 @@
ifndef JW_BUILD_DEF_MK_INCLUDED ifndef JW_BUILD_DEF_MK_INCLUDED
JW_BUILD_DEF_MK_INCLUDED = true JW_BUILD_DEF_MK_INCLUDED = true
ifeq ($(MAKE_BENCHMARK),true)
SHELL = /bin/bash $(MOD_SCRIPT_DIR)/timed-make-shell.sh
endif
MAKEFLAGS += -r MAKEFLAGS += -r
include $(MODDIR)/make/platform.mk include $(MODDIR)/make/platform.mk
include $(MODDIR)/make/projects.mk include $(MODDIR)/make/projects.mk
ifeq ($(MAKE_BENCHMARK),true)
SHELL = /bin/bash $(MOD_SCRIPT_DIR)/timed-make-shell.sh
endif
# ----- pre-local.mk # ----- pre-local.mk
ifneq ($(wildcard $(MODDIR)/make/pre-local.mk),) ifneq ($(wildcard $(MODDIR)/make/pre-local.mk),)
@ -39,7 +39,7 @@ PWD := $(shell which pwd)
CWD := $(shell $(PWD)) CWD := $(shell $(PWD))
BIN_INSTALL := /usr/bin/install BIN_INSTALL := /usr/bin/install
SUDO ?= /usr/bin/sudo SUDO ?= /usr/bin/sudo
GET_OS_SH ?= $(SHELL) $(MOD_SCRIPT_DIR)/get-os.sh GET_OS_SH ?= /bin/bash $(MOD_SCRIPT_DIR)/get-os.sh
# ----- standard variables # ----- standard variables
ifneq ($(wildcard $(TOPDIR)/.git),) ifneq ($(wildcard $(TOPDIR)/.git),)
@ -383,6 +383,7 @@ endif
# -- target files and dirs # -- target files and dirs
HDRDIR_SCOPE_SUFFIX ?= $(PROJECT)
SRC_SUFFIX += $(sort $(suffix $(wildcard $(TOPDIR)/hdr/*))) SRC_SUFFIX += $(sort $(suffix $(wildcard $(TOPDIR)/hdr/*)))
LOCAL_SRC += Makefile $(wildcard $(addprefix *,$(SRC_SUFFIX))) LOCAL_SRC += Makefile $(wildcard $(addprefix *,$(SRC_SUFFIX)))
SRC_HEADERED += $(shell if [ "$(LOCAL_SRC)" ]; then grep -ic "it services" $(LOCAL_SRC) | $(SED) '/:0$$/ d; s/:.*$$//'; fi) SRC_HEADERED += $(shell if [ "$(LOCAL_SRC)" ]; then grep -ic "it services" $(LOCAL_SRC) | $(SED) '/:0$$/ d; s/:.*$$//'; fi)
@ -1059,7 +1060,6 @@ endif
INCLUDE += $(LOCAL_INCLUDE) INCLUDE += $(LOCAL_INCLUDE)
HDRDIR_SCOPE_SUFFIX ?= $(PROJECT)
# force use of double quotes, allow header namespaces # force use of double quotes, allow header namespaces
ifeq ($(HDRDIR_SCOPE_SUFFIX),) ifeq ($(HDRDIR_SCOPE_SUFFIX),)
INCLUDE += -I. INCLUDE += -I.