From 72e44f330c2a4eaa7ded30b074a88a539ea414e2 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 12 Mar 2019 11:43:19 +0000 Subject: [PATCH] dev-utils.mk: Allow calling process-text-files.mk from within tree Signed-off-by: Jan Lindemann --- make/defs-cpp.mk | 2 +- make/dev-utils.mk | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/make/defs-cpp.mk b/make/defs-cpp.mk index b2f6f08c..7daec20f 100644 --- a/make/defs-cpp.mk +++ b/make/defs-cpp.mk @@ -431,7 +431,7 @@ else # -fconserve-stack # breaks constexpr - #NO_OPT_FLAGS += -fno-builtin + #NO_OPT_FLAGS += -fno-builtin _NO_OPT_FLAGS = \ -O0 \ diff --git a/make/dev-utils.mk b/make/dev-utils.mk index 9f74e197..86a57b55 100644 --- a/make/dev-utils.mk +++ b/make/dev-utils.mk @@ -1,7 +1,11 @@ ifndef DEV_UTILS_MK_INCLUDED DEV_UTILS_MK_INCLUDED = true -PROCESS_TEXT_FILES_PY := $(PYTHON) /opt/jw-python/bin/process-text-files.py +ifeq ($(DEVELOPMENT),true) + PROCESS_TEXT_FILES_PY := PYTHONPATH=$$PYTHONPATH:$(PROJECTS_DIR)/jw-python/tools/python python ../../jw-python/bin/process-text-files.py +else + PROCESS_TEXT_FILES_PY := $(PYTHON) /opt/jw-python/bin/process-text-files.py +endif MAKEFILE_INDENT_EQUAL_POS ?= 30 MAKEFILE_INDENT_NAME_REGEX ?= (\.mk$$|makefile$$|Makefile$$|GNUmakefile$$)