From 672ba1a43b210c872f404ab03ac3e8cd5d2dd052 Mon Sep 17 00:00:00 2001 From: Mark Charlebois Date: Wed, 11 Mar 2015 20:29:11 -0700 Subject: [PATCH] Linux: support gcc-4.6 and c++0x GCC 4.6 is too old for -std=c++11 but it supports -std=c++0x Signed-off-by: Mark Charlebois --- makefiles/setup.mk | 4 ++-- makefiles/toolchain_native.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/makefiles/setup.mk b/makefiles/setup.mk index 1c6e5c3a2e..fd4cbb1a77 100644 --- a/makefiles/setup.mk +++ b/makefiles/setup.mk @@ -33,8 +33,8 @@ # Path and tool setup # -export PX4_TARGET_OS = nuttx -#export PX4_TARGET_OS = linux +#export PX4_TARGET_OS = nuttx +export PX4_TARGET_OS = linux # # Some useful paths. diff --git a/makefiles/toolchain_native.mk b/makefiles/toolchain_native.mk index bb791195eb..91fafc6efd 100644 --- a/makefiles/toolchain_native.mk +++ b/makefiles/toolchain_native.mk @@ -114,7 +114,7 @@ ARCHOPTIMIZATION = $(MAXOPTIMIZATION) \ # Language-specific flags # ARCHCFLAGS = -std=gnu99 -g -ARCHCXXFLAGS = -fno-exceptions -fno-rtti -std=c++11 -fno-threadsafe-statics -D__CUSTOM_FILE_IO__ -g +ARCHCXXFLAGS = -fno-exceptions -fno-rtti -std=c++0x -fno-threadsafe-statics -D__CUSTOM_FILE_IO__ -g # Generic warnings #