CMakeLists.txt

@@ -19,7 +19,8 @@ if(TGT_BSP MATCHES "arm/q7s")
 endif()
 
 option(ADD_ETL_LIB "Add ETL library" ON)
-option(ADD_JSON_LIB "Add JSON librara" ON)
+option(ADD_JSON_LIB "Add JSON library" ON)
+option(EIVE_SYSROOT_MAGIC "Perform sysroot magic which might not be necessary" OFF)
 
 if(NOT FSFW_OSAL)
 	set(FSFW_OSAL host CACHE STRING "OS for the FSFW.")

cmake/Q7SCrossCompileConfig.cmake

@@ -54,6 +54,7 @@ set(CMAKE_SYSTEM_PROCESSOR "armv7")
 set(CMAKE_C_COMPILER ${CROSS_COMPILE_CC})
 set(CMAKE_CXX_COMPILER ${CROSS_COMPILE_CXX})
 
+if(EIVE_SYSROOT_MAGIC)
     # List of library dirs where LD has to look. Pass them directly through gcc. 
     set(LIB_DIRS
     	"${SYSROOT_PATH}/usr/include"
@@ -69,6 +70,7 @@ set(COMMON_FLAGS "-I${SYSROOT_PATH}/usr/lib")
     foreach(LIB ${LIB_DIRS})
     	set(COMMON_FLAGS "${COMMON_FLAGS} -L${LIB} -Wl,-rpath-link,${LIB}")
     endforeach()
+endif()
 
 set(CMAKE_PREFIX_PATH 
 	"${CMAKE_PREFIX_PATH}"