From 69c690e415e5c4d44901f13211b32eec44308987 Mon Sep 17 00:00:00 2001
From: Nanosonde <2073569+nanosonde@users.noreply.github.com>
Date: Sun, 8 Nov 2020 17:05:18 +0100
Subject: [PATCH] Fix toolchain for travis

---
 .travis.yml                                   | 25 ++++++++++---------
 .../cmake/toolchain-arm-none-eabi.cmake       |  6 ++---
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1d991ab..0e765d5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@
         - cmake --build .
 
     # Test build for CC13x0 platform
-    - language: minimal
+    - language: cpp
       dist: focal
       os: linux
       addons:
@@ -47,9 +47,10 @@
             - ubuntu-toolchain-r-test
           packages:
             - cmake
+            - arm-none-eabi-gcc
       env:
-        #- 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"
+        - 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"
       cache:
         directories:
       git:
@@ -57,17 +58,17 @@
         quiet: true
 
       before_install:
-        #- eval "${MATRIX_EVAL}"
+        - eval "${MATRIX_EVAL}"
 
       install:
-        - pushd .
-        - cd ~ 
-        - mkdir arm-gcc-toolchain
-        - wget -O $HOME/arm-gcc-toolchain/gcc.tar.bz2 $GCC_URL
-        - cd arm-gcc-toolchain
-        - tar -jxf gcc.tar.bz2 --strip=1
-        - popd
-        - export PATH=$HOME/arm-gcc-toolchain/bin:$PATH      
+        #- pushd .
+        #- cd ~ 
+        #- mkdir arm-gcc-toolchain
+        #- wget -O $HOME/arm-gcc-toolchain/gcc.tar.bz2 $GCC_URL
+        #- cd arm-gcc-toolchain
+        #- tar -jxf gcc.tar.bz2 --strip=1
+        #- popd
+        #- export PATH=$HOME/arm-gcc-toolchain/bin:$PATH      
 
       before_script:
         - arm-none-eabi-gcc --version
diff --git a/examples/knx-cc1310/cmake/toolchain-arm-none-eabi.cmake b/examples/knx-cc1310/cmake/toolchain-arm-none-eabi.cmake
index 3a6ed6a..1919b71 100644
--- a/examples/knx-cc1310/cmake/toolchain-arm-none-eabi.cmake
+++ b/examples/knx-cc1310/cmake/toolchain-arm-none-eabi.cmake
@@ -109,9 +109,9 @@ set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-flto" CACHE INTERNAL "Linker options for re
 #---------------------------------------------------------------------------------------
 # Set compilers
 #---------------------------------------------------------------------------------------
-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_ASM_COMPILER ${TOOLCHAIN_BIN_DIR}/${TOOLCHAIN}-gcc${TOOLCHAIN_EXT} CACHE INTERNAL "ASM 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_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_LIBRARY ONLY)