Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2025-10-08 11:14:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix toolchain for travis

Browse Source
This commit is contained in:
Nanosonde 2020-11-08 17:05:18 +01:00
parent 6da6968c5a
commit 69c690e415
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
.travis.yml
View File

@ -38,7 +38,7 @@
- cmake --build . - cmake --build .
# Test build for CC13x0 platform # Test build for CC13x0 platform
- language: minimal - language: cpp
dist: focal dist: focal
os: linux os: linux
addons: addons:
@ -47,9 +47,10 @@
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
packages: packages:
- cmake - cmake
- arm-none-eabi-gcc
env: env:
#- MATRIX_EVAL="CC=arm-none-eabi-gcc && CXX=arm-none-eabi-g++" - MATRIX_EVAL="CC=arm-none-eabi-gcc && CXX=arm-none-eabi-g++"
- GCC_URL="https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2?revision=108bd959-44bd-4619-9c19-26187abf5225&la=en&hash=E788CE92E5DFD64B2A8C246BBA91A249CB8E2D2D" #- GCC_URL="https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2?revision=108bd959-44bd-4619-9c19-26187abf5225&la=en&hash=E788CE92E5DFD64B2A8C246BBA91A249CB8E2D2D"
cache: cache:
directories: directories:
git: git:
@ -57,17 +58,17 @@
quiet: true quiet: true
before_install: before_install:
#- eval "${MATRIX_EVAL}" - eval "${MATRIX_EVAL}"
install: install:
- pushd . #- pushd .
- cd ~ #- cd ~
- mkdir arm-gcc-toolchain #- mkdir arm-gcc-toolchain
- wget -O $HOME/arm-gcc-toolchain/gcc.tar.bz2 $GCC_URL #- wget -O $HOME/arm-gcc-toolchain/gcc.tar.bz2 $GCC_URL
- cd arm-gcc-toolchain #- cd arm-gcc-toolchain
- tar -jxf gcc.tar.bz2 --strip=1 #- tar -jxf gcc.tar.bz2 --strip=1
- popd #- popd
- export PATH=$HOME/arm-gcc-toolchain/bin:$PATH #- export PATH=$HOME/arm-gcc-toolchain/bin:$PATH
before_script: before_script:
- arm-none-eabi-gcc --version - arm-none-eabi-gcc --version

6
examples/knx-cc1310/cmake/toolchain-arm-none-eabi.cmake
View File

@ -109,9 +109,9 @@ set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-flto" CACHE INTERNAL "Linker options for re
#--------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------
# Set compilers # Set compilers
#--------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------
set(CMAKE_C_COMPILER ${TOOLCHAIN_BIN_DIR}/${TOOLCHAIN}-gcc${TOOLCHAIN_EXT} CACHE INTERNAL "C Compiler") #set(CMAKE_C_COMPILER ${TOOLCHAIN_BIN_DIR}/${TOOLCHAIN}-gcc${TOOLCHAIN_EXT} CACHE INTERNAL "C Compiler")
set(CMAKE_CXX_COMPILER ${TOOLCHAIN_BIN_DIR}/${TOOLCHAIN}-g++${TOOLCHAIN_EXT} CACHE INTERNAL "C++ Compiler") #set(CMAKE_CXX_COMPILER ${TOOLCHAIN_BIN_DIR}/${TOOLCHAIN}-g++${TOOLCHAIN_EXT} CACHE INTERNAL "C++ Compiler")
set(CMAKE_ASM_COMPILER ${TOOLCHAIN_BIN_DIR}/${TOOLCHAIN}-gcc${TOOLCHAIN_EXT} CACHE INTERNAL "ASM Compiler") #set(CMAKE_ASM_COMPILER ${TOOLCHAIN_BIN_DIR}/${TOOLCHAIN}-gcc${TOOLCHAIN_EXT} CACHE INTERNAL "ASM Compiler")
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)