diff options
| -rw-r--r-- | ffbuild/common.mak | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ffbuild/common.mak b/ffbuild/common.mak index 24113c59eb..f52473453e 100644 --- a/ffbuild/common.mak +++ b/ffbuild/common.mak @@ -29,6 +29,9 @@ $(foreach VAR,$(SILENT),$(eval override $(VAR) = @$($(VAR)))) $(eval INSTALL = @$(call ECHO,INSTALL,$$(^:$(SRC_DIR)/%=%)); $(INSTALL)) endif +# Prepend to a recursively expanded variable without making it simply expanded. +PREPEND = $(eval $(1) = $(patsubst %,$$(%), $(2)) $(value $(1))) + # NASM requires -I path terminated with / IFLAGS := -I. -I$(SRC_LINK)/ CPPFLAGS := $(IFLAGS) $(CPPFLAGS) @@ -37,7 +40,9 @@ CCFLAGS = $(CPPFLAGS) $(CFLAGS) OBJCFLAGS += $(EOBJCFLAGS) OBJCCFLAGS = $(CPPFLAGS) $(CFLAGS) $(OBJCFLAGS) ASFLAGS := $(CPPFLAGS) $(ASFLAGS) -CXXFLAGS := $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) +# Use PREPEND here so that later (target-dependent) additions to CPPFLAGS +# end up in CXXFLAGS. +$(call PREPEND,CXXFLAGS, CPPFLAGS CFLAGS) X86ASMFLAGS += $(IFLAGS:%=%/) -I$(<D)/ -Pconfig.asm HOSTCCFLAGS = $(IFLAGS) $(HOSTCPPFLAGS) $(HOSTCFLAGS) |