summaryrefslogtreecommitdiffstats
path: root/rules.mk
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2012-08-25 08:49:08 +0200
committertmk <nobody@nowhere>2012-08-28 14:56:15 +0200
commitc5060ea81942b0e3f8577536ff78402a19abe3d3 (patch)
treebcdd4cd269be3064982014b0afdc0aea628d7048 /rules.mk
parent9382bf2f765cfbb8f7a9a48157391cac2bb71780 (diff)
downloadqmk_firmware-c5060ea81942b0e3f8577536ff78402a19abe3d3.tar.gz
qmk_firmware-c5060ea81942b0e3f8577536ff78402a19abe3d3.tar.xz
test build of 'Host shield' in minimal env.
Diffstat (limited to 'rules.mk')
-rw-r--r--rules.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/rules.mk b/rules.mk
index 02f07fd6f..f53fe912a 100644
--- a/rules.mk
+++ b/rules.mk
@@ -187,6 +187,7 @@ endif
# -listing-cont-lines: Sets the maximum number of continuation lines of hex
# dump that will be displayed for a given single line of source input.
ASFLAGS = $(ADEFS) -Wa,-adhlns=$(@:%.o=%.lst),-gstabs,--listing-cont-lines=100
+ASFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
ifdef CONFIG_H
ASFLAGS += -include $(CONFIG_H)
endif
@@ -345,9 +346,9 @@ GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d
# Combine all necessary flags and optional flags.
# Add target processor to flags.
# You can give extra flags at 'make' command line like: make EXTRAFLAGS=-DFOO=bar
-ALL_CFLAGS = -mmcu=$(MCU) -I. $(CFLAGS) $(GENDEPFLAGS) $(EXTRAFLAGS)
-ALL_CPPFLAGS = -mmcu=$(MCU) -I. -x c++ $(CPPFLAGS) $(GENDEPFLAGS) $(EXTRAFLAGS)
-ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS) $(EXTRAFLAGS)
+ALL_CFLAGS = -mmcu=$(MCU) $(CFLAGS) $(GENDEPFLAGS) $(EXTRAFLAGS)
+ALL_CPPFLAGS = -mmcu=$(MCU) -x c++ $(CPPFLAGS) $(GENDEPFLAGS) $(EXTRAFLAGS)
+ALL_ASFLAGS = -mmcu=$(MCU) -x assembler-with-cpp $(ASFLAGS) $(EXTRAFLAGS)
@@ -569,7 +570,7 @@ $(OBJDIR)/%.o : %.S
# Create preprocessed source for use in sending a bug report.
%.i : %.c
- $(CC) -E -mmcu=$(MCU) -I. $(CFLAGS) $< -o $@
+ $(CC) -E -mmcu=$(MCU) $(CFLAGS) $< -o $@
# Target: clean project.