From 3140d8690585f76e8adb9360641a3d5bd397416a Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 13 Jan 2020 02:08:50 +0100
Subject: [PATCH] Fix cross-compiling in CI

---
 CMakeLists.txt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index df83140f4..63f0fc05e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -832,8 +832,11 @@ if(NOT VOLKGNSSSDR_FOUND)
         endif()
     endif()
 
-    set(VOLK_GNSSSDR_COMPILER -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
-
+    if(CMAKE_CROSSCOMPILING)
+        set(VOLK_GNSSSDR_COMPILER "")
+    else()
+        set(VOLK_GNSSSDR_COMPILER -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
+    endif()
     find_package(ORC)
     set_package_properties(ORC PROPERTIES
         PURPOSE "Used by volk_gnsssdr."
@@ -860,7 +863,7 @@ if(NOT VOLKGNSSSDR_FOUND)
         )
     else()
         if(CMAKE_TOOLCHAIN_FILE)
-            set(VOLK_GNSSSDR_CMAKE_ARGS
+            set(VOLK_GNSSSDR_CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
                 -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
             )
         endif()