summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rondeau2012-02-23 13:55:24 -0500
committerTom Rondeau2012-02-23 13:55:24 -0500
commite5bf23ddd93ba33fe92a835b24482fd4cf9ec3aa (patch)
tree0d540fd30710f479ccc55581ed58e829d84ebd2d
parent059e79a6c66fa8fae4fc92ca7283c7a07989232f (diff)
parentdc963e9c64ae990068bbcbc7860b9e24d773bd41 (diff)
downloadgnuradio-e5bf23ddd93ba33fe92a835b24482fd4cf9ec3aa.tar.gz
gnuradio-e5bf23ddd93ba33fe92a835b24482fd4cf9ec3aa.tar.bz2
gnuradio-e5bf23ddd93ba33fe92a835b24482fd4cf9ec3aa.zip
Merge branch 'master' into next
-rw-r--r--cmake/Toolchains/arm_cortex_a8_native.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/Toolchains/arm_cortex_a8_native.cmake b/cmake/Toolchains/arm_cortex_a8_native.cmake
index 7dbb80049..8e60eaab1 100644
--- a/cmake/Toolchains/arm_cortex_a8_native.cmake
+++ b/cmake/Toolchains/arm_cortex_a8_native.cmake
@@ -4,5 +4,5 @@
########################################################################
set(CMAKE_CXX_COMPILER g++)
set(CMAKE_C_COMPILER gcc)
-set(CMAKE_CXX_FLAGS "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp")
-set(CMAKE_C_FLAGS ${CMAKE_CXX_FLAGS}) #same flags for C sources
+set(CMAKE_CXX_FLAGS "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS ${CMAKE_CXX_FLAGS} CACHE STRING "" FORCE) #same flags for C sources