summaryrefslogtreecommitdiff
path: root/cesar/common
diff options
context:
space:
mode:
authorNicolas Schodet2010-02-03 15:56:42 +0100
committerNicolas Schodet2011-08-03 11:08:50 +0200
commit944d132cd873c105cf84f69f8024e7d0e7c9ad7e (patch)
tree43ede9769f665b67786a71df38b31258b3a16005 /cesar/common
parent9052a918906770bbaf336c4781d4e430d0f25f62 (diff)
cesar/common/make: filter out eCos include paths
This is a problem because ECOS_MAKEFLAGS were not defined when generating the ecos.mk file which leads to bad options. Anyway those should be kept in the eCos domain.
Diffstat (limited to 'cesar/common')
-rw-r--r--cesar/common/make/ecos.mk7
1 files changed, 5 insertions, 2 deletions
diff --git a/cesar/common/make/ecos.mk b/cesar/common/make/ecos.mk
index 0e05566542..5622be75b1 100644
--- a/cesar/common/make/ecos.mk
+++ b/cesar/common/make/ecos.mk
@@ -56,6 +56,7 @@ ifdef ECOS_GLOBAL_CFLAGS
ECOS_GLOBAL_CFLAGS := $(subst -O2,,$(ECOS_GLOBAL_CFLAGS))
ECOS_GLOBAL_CFLAGS := $(subst -fdata-sections,,$(ECOS_GLOBAL_CFLAGS))
ECOS_GLOBAL_CFLAGS := $(subst -ffunction-sections,,$(ECOS_GLOBAL_CFLAGS))
+ ECOS_GLOBAL_CFLAGS := $(filter-out -I%,$(ECOS_GLOBAL_CFLAGS))
# Separate C++ flags out from C flags.
ECOS_CFLAGS := $(ECOS_GLOBAL_CFLAGS)
@@ -81,14 +82,16 @@ ifdef ECOS_GLOBAL_CFLAGS
ifneq ($(TARGET_CROSS_COMPILE),$(ECOS_COMMAND_PREFIX))
ECOS_MAKEFLAGS := COMMAND_PREFIX=$(TARGET_CROSS_COMPILE)
endif
- ECOS_MAKEFLAGS += BASE=$(CURDIR)/$(BASE) OBJ_DIR=$(CURDIR)/$(OBJ_DIR) \
- EXTRA_INCLUDES='-I$(CURDIR)/$(OBJ_INC_DIR) -I$(CURDIR)/$(TARGET_OBJ_INC_DIR)'
else
# Catch errors.
TARGET_CC = $(error no ecos definitions included)
TARGET_CXX = $(error no ecos definitions included)
endif
+# Exports for include paths.
+ECOS_MAKEFLAGS += BASE=$(CURDIR)/$(BASE) OBJ_DIR=$(CURDIR)/$(OBJ_DIR) \
+ EXTRA_INCLUDES='-I$(CURDIR)/$(OBJ_INC_DIR) -I$(CURDIR)/$(TARGET_OBJ_INC_DIR)'
+
EXTRA_CLEAN += ecos.clean
.PHONY: ecos.all ecos.headers ecos.tree ecos.config ecos.compact-config ecos.clean