From 195dbf4ab629faf603389bb274ad9c679e1d50dc Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sun, 6 Jan 2019 11:33:21 -0500
Subject: [PATCH] NuttX platform remove system (toolchain) stdc++ include path
---
platforms/nuttx/CMakeLists.txt | 2 ++
platforms/nuttx/NuttX/Make.defs.in | 1 +
2 files changed, 3 insertions(+)
diff --git a/platforms/nuttx/CMakeLists.txt b/platforms/nuttx/CMakeLists.txt
index 4eb10a1bcf..d7af383a83 100644
--- a/platforms/nuttx/CMakeLists.txt
+++ b/platforms/nuttx/CMakeLists.txt
@@ -83,6 +83,7 @@ target_link_libraries(nuttx_cxx INTERFACE nuttx_c)
target_link_libraries(px4 PRIVATE
+ -nostartfiles
-nodefaultlibs
-nostdlib
@@ -99,6 +100,7 @@ target_link_libraries(px4 PRIVATE
-Wl,--end-group
m
+ gcc
)
target_link_libraries(px4 PRIVATE ${module_libraries})
diff --git a/platforms/nuttx/NuttX/Make.defs.in b/platforms/nuttx/NuttX/Make.defs.in
index 6a8234f7c0..52651c7dae 100644
--- a/platforms/nuttx/NuttX/Make.defs.in
+++ b/platforms/nuttx/NuttX/Make.defs.in
@@ -108,6 +108,7 @@ CFLAGS = $(ARCHINCLUDES) \
CXXFLAGS = $(ARCHXXINCLUDES) \
-std=gnu++11 \
+ -nostdinc++ \
${CMAKE_CXX_FLAGS} \
$(FLAGS) \
-fcheck-new \
--
GitLab