summaryrefslogtreecommitdiff
path: root/nuttx/configs/sim/nsh2/Make.defs
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-11-29 14:26:12 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-11-29 14:26:12 +0000
commit2ff21a4ebbe5385a702567220d6287b66cd9328b (patch)
tree349f1810aca17c286eef47de73598a27dd781d52 /nuttx/configs/sim/nsh2/Make.defs
parentbc04273fb6fc7ea5392b69001e9a597f8996a65b (diff)
downloadpx4-nuttx-2ff21a4ebbe5385a702567220d6287b66cd9328b.tar.gz
px4-nuttx-2ff21a4ebbe5385a702567220d6287b66cd9328b.tar.bz2
px4-nuttx-2ff21a4ebbe5385a702567220d6287b66cd9328b.zip
wchar_t is a C++ built in and should not (always) be defined
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4128 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/sim/nsh2/Make.defs')
-rw-r--r--nuttx/configs/sim/nsh2/Make.defs3
1 files changed, 2 insertions, 1 deletions
diff --git a/nuttx/configs/sim/nsh2/Make.defs b/nuttx/configs/sim/nsh2/Make.defs
index b127e0a20..39b33dc7d 100644
--- a/nuttx/configs/sim/nsh2/Make.defs
+++ b/nuttx/configs/sim/nsh2/Make.defs
@@ -49,6 +49,7 @@ ARCHPICFLAGS = -fpic
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHWARNINGSXX = -Wall -Wshadow
ARCHDEFINES =
+ARCHDEFINESXX = -DCONFIG_WCHAR_BUILTIN
ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
ARCHINCLUDESXX = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
ARCHSCRIPT =
@@ -66,7 +67,7 @@ OBJDUMP = $(CROSSDEV)objdump
CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
$(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
CXXFLAGS = $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) \
- $(ARCHCPUFLAGSXX) $(ARCHINCLUDESXX) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+ $(ARCHCPUFLAGSXX) $(ARCHINCLUDESXX) $(ARCHDEFINESXX) $(EXTRADEFINES) -pipe
CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
AFLAGS = $(CFLAGS) -D__ASSEMBLY__