From 58ca307c9d979dcc7c8e517cff6d1cef855eb4ee Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Thu, 22 Jun 2017 12:13:31 -0400
Subject: [PATCH] move -fno-math-errno to nuttx only

---
 cmake/common/px4_base.cmake      | 1 -
 cmake/nuttx/px4_impl_nuttx.cmake | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/cmake/common/px4_base.cmake b/cmake/common/px4_base.cmake
index 8b5204fc7d..b38c93f91a 100644
--- a/cmake/common/px4_base.cmake
+++ b/cmake/common/px4_base.cmake
@@ -371,7 +371,6 @@ function(px4_add_common_flags)
 		-funsafe-math-optimizations
 		-ffunction-sections
 		-fdata-sections
-		-fno-math-errno
 		-fmerge-all-constants
 		${PIC_FLAG}
 		)
diff --git a/cmake/nuttx/px4_impl_nuttx.cmake b/cmake/nuttx/px4_impl_nuttx.cmake
index 562cc6c984..382119a4e0 100644
--- a/cmake/nuttx/px4_impl_nuttx.cmake
+++ b/cmake/nuttx/px4_impl_nuttx.cmake
@@ -579,6 +579,10 @@ function(px4_os_add_flags)
 		-nostdlib
 		)
 
+	set(added_optimization_flags
+		-fno-math-errno
+		)
+
 	set(added_exe_linker_flags) # none currently
 
 	set(instrument_flags)