summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2017-03-24 15:47:56 -0700
committerStefan Agner <stefan.agner@toradex.com>2017-03-24 17:15:34 -0700
commit5edada93bf4d1897ed899b29e3cbb33582c6fc1f (patch)
tree91889063e6de0155ffdfe3a0b49cbcc1d52292e0
parent0f1f3957e9cb44292ce11718bbf687474f3f2776 (diff)
avoid using deprecated CMake features
Avoid the following type of warning by properly use the default variable CMAKE_FORCE_C_COMPILER and making sure compile tests succeed: The CMAKE_FORCE_C_COMPILER macro is deprecated. Instead just set CMAKE_C_COMPILER and allow CMake to identify the compiler. Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
-rw-r--r--tools/cmake_toolchain_files/armgcc.cmake10
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/cmake_toolchain_files/armgcc.cmake b/tools/cmake_toolchain_files/armgcc.cmake
index c1a8dc7..3d7f729 100644
--- a/tools/cmake_toolchain_files/armgcc.cmake
+++ b/tools/cmake_toolchain_files/armgcc.cmake
@@ -1,5 +1,3 @@
-INCLUDE(CMakeForceCompiler)
-
# TOOLCHAIN EXTENSION
IF(WIN32)
SET(TOOLCHAIN_EXT ".exe")
@@ -35,8 +33,12 @@ SET(TOOLCHAIN_LIB_DIR ${TOOLCHAIN_DIR}/${TARGET_TRIPLET}/lib)
SET(CMAKE_SYSTEM_NAME Generic)
SET(CMAKE_SYSTEM_PROCESSOR arm)
-CMAKE_FORCE_C_COMPILER(${TOOLCHAIN_BIN_DIR}/${TARGET_TRIPLET}-gcc${TOOLCHAIN_EXT} GNU)
-CMAKE_FORCE_CXX_COMPILER(${TOOLCHAIN_BIN_DIR}/${TARGET_TRIPLET}-g++${TOOLCHAIN_EXT} GNU)
+# make sure toolchain tests succeed
+SET(CMAKE_C_FLAGS "--specs=nosys.specs" CACHE INTERNAL "make spec")
+SET(CMAKE_CXX_FLAGS "--specs=nosys.specs" CACHE INTERNAL "make spec")
+
+SET(CMAKE_C_COMPILER ${TOOLCHAIN_BIN_DIR}/${TARGET_TRIPLET}-gcc${TOOLCHAIN_EXT})
+SET(CMAKE_CXX_COMPILER ${TOOLCHAIN_BIN_DIR}/${TARGET_TRIPLET}-g++${TOOLCHAIN_EXT})
SET(CMAKE_ASM_COMPILER ${TOOLCHAIN_BIN_DIR}/${TARGET_TRIPLET}-gcc${TOOLCHAIN_EXT})
SET(CMAKE_OBJCOPY ${TOOLCHAIN_BIN_DIR}/${TARGET_TRIPLET}-objcopy CACHE INTERNAL "objcopy tool")