Skip to content

Commit

Permalink
Switch to hard-float in Travis, fix Armhf toolchain
Browse files Browse the repository at this point in the history
Per #26
  • Loading branch information
tresf committed Apr 24, 2019
1 parent ecb9027 commit 02e2129
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ matrix:
- cmake3
- g++-mingw-w64-x86-64
- os: linux
env: PROFILE=armsf,armtrusty
env: PROFILE=armhf,armtrusty
addons:
apt:
packages:
- cmake3
- g++-arm-linux-gnueabi
- g++-arm-linux-gnueabihf
- os: linux
env: PROFILE=aarch64
addons:
Expand Down
6 changes: 3 additions & 3 deletions toolchain/Armhf.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ if(NOT SKIP_COMPILER_VERSION)
endif()
endif()
SET(TOOLCHAIN_SUFFIX hf)
SET(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc${COMPILER_VERSION})
SET(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++${COMPILER_VERSION})
SET(CMAKE_STRIP ${TOOLCHAIN_PREFIX}-strip CACHE FILEPATH "" FORCE)
SET(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}${TOOLCHAIN_SUFFIX}-gcc${COMPILER_VERSION})
SET(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}${TOOLCHAIN_SUFFIX}-g++${COMPILER_VERSION})
SET(CMAKE_STRIP ${TOOLCHAIN_PREFIX}${TOOLCHAIN_SUFFIX}-strip CACHE FILEPATH "" FORCE)
SET(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX}${TOOLCHAIN_SUFFIX}/)
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
Expand Down
6 changes: 3 additions & 3 deletions toolchain/Armsf.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ if(NOT SKIP_COMPILER_VERSION)
endif()
endif()
SET(TOOLCHAIN_SUFFIX "")
SET(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc${COMPILER_VERSION})
SET(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++${COMPILER_VERSION})
SET(CMAKE_STRIP ${TOOLCHAIN_PREFIX}-strip CACHE FILEPATH "" FORCE)
SET(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}${TOOLCHAIN_SUFFIX}-gcc${COMPILER_VERSION})
SET(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}${TOOLCHAIN_SUFFIX}-g++${COMPILER_VERSION})
SET(CMAKE_STRIP ${TOOLCHAIN_PREFIX}${TOOLCHAIN_SUFFIX}-strip CACHE FILEPATH "" FORCE)
SET(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX}${TOOLCHAIN_SUFFIX}/)
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
Expand Down

0 comments on commit 02e2129

Please sign in to comment.