aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Kay <chris.kay@arm.com>2020-03-04 17:27:20 +0000
committerjimqui01 <54316584+jimqui01@users.noreply.github.com>2020-03-24 17:44:33 +0000
commit8849ef2a71d0af6e16306448eb45db41fec31874 (patch)
tree0223181cf593046fe373360896b9149928c9ec93
parenta3516fa9f47d0934dc724af9171a6ee9e00ea9f2 (diff)
build: Allow preprocessor flags to be configured
This commit also ensures the C, and not C++, preprocessor is used. Change-Id: I43b6e44a9da4fe7e52a9af41d892600a8e20fa31 Signed-off-by: Chris Kay <chris.kay@arm.com>
-rw-r--r--tools/build_system/firmware.mk2
-rw-r--r--tools/build_system/rules.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/tools/build_system/firmware.mk b/tools/build_system/firmware.mk
index ee1e2a94..ba19b79f 100644
--- a/tools/build_system/firmware.mk
+++ b/tools/build_system/firmware.mk
@@ -306,7 +306,7 @@ $(TARGET_ELF): $(LIB_TARGETS_y) $(SCATTER_PP) $(OBJECTS) | $$(@D)/
$(SCATTER_PP): $(SCATTER_SRC) | $$(@D)/
$(call show-action,GEN,$@)
- $(CC) $(CFLAGS) -E -P -C $< -o $@
+ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@
$(TARGET_BIN): $(TARGET_ELF) | $$(@D)/
$(call show-action,BIN,$@)
diff --git a/tools/build_system/rules.mk b/tools/build_system/rules.mk
index 6dca0aeb..5df987da 100644
--- a/tools/build_system/rules.mk
+++ b/tools/build_system/rules.mk
@@ -124,6 +124,8 @@ CFLAGS_CLANG += -fshort-enums # Required by RTX
CFLAGS += -fno-exceptions
+CPPFLAGS += -x c -E -P
+
DEP_CFLAGS_GCC = -MD -MP
ASFLAGS_GCC += -x