Commit 9f495bc1 authored by Joseph Noir's avatar Joseph Noir

Add cross compiler adjustments

* Omit c++11 compiler check if specified in configure
* Don't add pthread
* Append flags from toolchain file to the compiler flags
  (this should happen automatically, but the CMakeForceCompiler
  module does not seem to work)
parent 095a6c09
...@@ -188,7 +188,7 @@ if(CAF_ENABLE_ADDRESS_SANITIZER) ...@@ -188,7 +188,7 @@ if(CAF_ENABLE_ADDRESS_SANITIZER)
set(CMAKE_CXX_FLAGS "${CXXFLAGS_BACKUP}") set(CMAKE_CXX_FLAGS "${CXXFLAGS_BACKUP}")
endif(CAF_ENABLE_ADDRESS_SANITIZER) endif(CAF_ENABLE_ADDRESS_SANITIZER)
# -pthread is ignored on MacOSX but required on other platforms # -pthread is ignored on MacOSX but required on other platforms
if(NOT APPLE AND NOT WIN32) if(NOT APPLE AND NOT WIN32 AND NOT CMAKE_CROSSCOMPILING)
set(EXTRA_FLAGS "${EXTRA_FLAGS} -pthread") set(EXTRA_FLAGS "${EXTRA_FLAGS} -pthread")
endif() endif()
# -fPIC generates warnings on MinGW plus extra setup steps needed on MinGW # -fPIC generates warnings on MinGW plus extra setup steps needed on MinGW
...@@ -256,8 +256,16 @@ endif() ...@@ -256,8 +256,16 @@ endif()
if(CAF_FOR_RIOT) if(CAF_FOR_RIOT)
add_definitions(-D__RIOTBUILD_FLAG) add_definitions(-D__RIOTBUILD_FLAG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") if (NOT CMAKE_CROSSCOMPILING)
set(LD_FLAGS "${LD_FLAGS} -m32") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
set(LD_FLAGS "${LD_FLAGS} -m32")
endif()
if (CROSS_CXX_FLAGS)
message(STATUS "Setting CMAKE_CXX_FLAGS to ${CROSS_CXX_FLAGS}")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CROSS_C_FLAGS}")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CROSS_CXX_FLAGS}")
endif()
message(STATUS "using compiler ${CMAKE_C_COMPILER} and ${CMAKE_CXX_COMPILER}")
endif() endif()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment