diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-05 12:16:45 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-05 12:16:45 -0600 |
| commit | d308c39cb1ec396ad2a46bd38afcc4d9f255b557 (patch) | |
| tree | 3acbef0a2ac919efc25f09475cd85526b52573c7 | |
| parent | 39b2a226ffcaa5296e61aef001143b76e3661505 (diff) | |
| download | nuttx-d308c39cb1ec396ad2a46bd38afcc4d9f255b557.tar.gz nuttx-d308c39cb1ec396ad2a46bd38afcc4d9f255b557.tar.bz2 nuttx-d308c39cb1ec396ad2a46bd38afcc4d9f255b557.zip | |
apps/import Make.defs must also define CFLAGS
| -rw-r--r-- | apps/import/Make.defs | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/apps/import/Make.defs b/apps/import/Make.defs index 5c3074295..702dd1480 100644 --- a/apps/import/Make.defs +++ b/apps/import/Make.defs @@ -57,7 +57,7 @@ endif OBJEXT ?= .o LIBEXT ?= .a -# Common default defintions +# Common default definitions # # PREPROCESS - Default macro to run the C pre-processor # COMPILE - Default macro to compile one C file @@ -147,3 +147,24 @@ define CLEAN endef endif + +# Tool related definitions + +ifeq ($(WINTOOL),y) + # Windows-native toolchains + ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" + ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" +else + # Linux/Cygwin-native toolchain + ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include + ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx +endif + +CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe +CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS) + +CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe +CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS) + +CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) +AFLAGS = $(CFLAGS) -D__ASSEMBLY__ |