[Commit-gnuradio] [gnuradio] 01/02: volk: potentially better solution to finding the architecture for ASM files.

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch master
in repository gnuradio.

commit ffe0becf9388416d6cdc70bfafd36d7049a741f9
Author: Tom Rondeau <address@hidden>
Date:   Wed Jul 30 18:13:05 2014 -0400

    volk: potentially better solution to finding the architecture for ASM files.
    
    OE bitbake environment and the SDK cross-compiling environments put the 
-march flag in different places. This pulls both together to search for it. 
Might still be a better solution out there.
---
 volk/lib/CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt
index c768c3c..71f3268 100644
--- a/volk/lib/CMakeLists.txt
+++ b/volk/lib/CMakeLists.txt
@@ -388,11 +388,14 @@ include_directories(
 if(${CMAKE_VERSION} VERSION_GREATER "2.8.9")
   set(ASM_ARCHS_AVAILABLE "armv7")
 
+  set(FULL_C_FLAGS "${CMAKE_C_FLAGS}" "${CMAKE_CXX_COMPILER_ARG1}")
+
   # sort through a list of all architectures we have ASM for
   # if we find one that matches our current system architecture
   # set up the assembler flags and include the source files
   foreach(ARCH ${ASM_ARCHS_AVAILABLE})
-    string(REGEX MATCH "^${ARCH}" ASM_ARCH "${CMAKE_SYSTEM_PROCESSOR}")
+    message(STATUS "--==>> -CFLAGS1: ${FULL_C_FLAGS}")
+    string(REGEX MATCH "${ARCH}" ASM_ARCH "${FULL_C_FLAGS}")
     if( ASM_ARCH STREQUAL "armv7" )
       set(ASM-ATT $ENV{ASM})
       message(STATUS "---- Adding ASM files") # we always use ATT syntax