From 7854c5488010918290300db51ab06f0c55cc1091 Mon Sep 17 00:00:00 2001 From: Pat Hickey Date: Wed, 22 Aug 2012 17:30:33 -0700 Subject: [PATCH] Arduino.mk: when core is excluded, add -DEXCLUDECORE to flags --- libraries/AP_Common/Arduino.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/AP_Common/Arduino.mk b/libraries/AP_Common/Arduino.mk index 5ef89c29e4..f285f04c36 100644 --- a/libraries/AP_Common/Arduino.mk +++ b/libraries/AP_Common/Arduino.mk @@ -228,7 +228,7 @@ endif # # Tool options # -DEFINES = -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERS) $(EXTRAFLAGS) +DEFINES = -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERS) $(EXTRAFLAGS) OPTFLAGS = -Os -Wformat -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wformat=2 -Wno-reorder DEPFLAGS = -MD -MT $@ @@ -385,8 +385,9 @@ CORELIBOBJS := $(subst $(CORESRC_DIR),$(BUILDROOT)/$(HARDWARE),$(CORESRCS)) CORELIBOBJS := $(addsuffix .o,$(basename $(CORELIBOBJS))) else #if EXCLUDE_CORE is nonempty (true), set COREINCLUDES and CORELIBOBJS to empty -COREINCLUDES = +COREINCLUDES := CORELIBOBJS := +EXTRAFLAGS := -DEXCLUDECORE endif ################################################################################