aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mk: fixup qurt and qflight builds with HAVE_STD_MOVE=0

Browse Source
This commit is contained in:
Andrew Tridgell 2016-02-16 21:40:01 +11:00 committed by Lucas De Marchi
parent 29100937bc
commit 815d653283
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mk/board_qflight.mk
View File

@ -37,7 +37,7 @@ GENERATE_TARGETS = $(GENERATE_DSP_C) $(GENERATE_ARM_C) $(QFLIGHT_BUILD)/qflight_
LIBOBJS += $(QFLIGHT_BUILD)/qflight_stub.o
# Add missing parts from libc and libstdc++
MISSING_TOOLCHAIN_FLAGS += -DHAVE_NULLPTR_T=0
MISSING_TOOLCHAIN_FLAGS += -DHAVE_NULLPTR_T=0 -DHAVE_STD_MOVE=0
MISSING_TOOLCHAIN_FLAGS += -I$(SKETCHBOOK)/libraries/AP_Common/missing
# DSP build flags

2
mk/board_qurt.mk
View File

@ -49,7 +49,7 @@ DSP_FLAGS=-mv5 -G0 -g $(OPT) $(DSP_WARN) -fno-exceptions -fno-strict-aliasing -f
DSP_LINK_FLAGS = -mv5 -G0 -fpic -shared -Wl,-Bsymbolic -Wl,--wrap=malloc -Wl,--wrap=calloc -Wl,--wrap=free -Wl,--wrap=realloc -Wl,--wrap=memalign -Wl,--wrap=__stack_chk_fail -Wl,-soname=lib$(SKETCHNAME)_skel.so
# Add missing parts from libc and libstdc++
MISSING_TOOLCHAIN_FLAGS += -DHAVE_NULLPTR_T=0
MISSING_TOOLCHAIN_FLAGS += -DHAVE_NULLPTR_T=0 -DHAVE_STD_MOVE=0
MISSING_TOOLCHAIN_FLAGS += -I$(SKETCHBOOK)/libraries/AP_Common/missing
CXXFLAGS += -std=gnu++11 $(WARNFLAGS) $(WARNFLAGSCXX) $(DEPFLAGS) $(MISSING_TOOLCHAIN_FLAGS) $(CXXOPTS) $(DEFINES) $(DSP_FLAGS)