From fb6fc3c15ca3d85c11c1c13a2ea4f0590e97c133 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Mon, 16 Nov 2020 16:55:30 -0800
Subject: [PATCH] Clean up gcc_version

---
 build/install.sh | 6 +-----
 build/linux.yml  | 2 --
 build/main.yml   | 2 --
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/build/install.sh b/build/install.sh
index f3e42c8..e0d4d43 100755
--- a/build/install.sh
+++ b/build/install.sh
@@ -65,11 +65,7 @@ install_linux_dependencies() {
 configure_cargo() {
     local prefix=$(gcc_prefix)
     if [ -n "${prefix}" ]; then
-        local gcc_suffix=
-        # if [ -n "$GCC_VERSION" ]; then
-        #   gcc_suffix="-$GCC_VERSION"
-        # fi
-        local gcc="${prefix}gcc${gcc_suffix}"
+        local gcc="${prefix}gcc"
 
         # information about the cross compiler
         "${gcc}" -v
diff --git a/build/linux.yml b/build/linux.yml
index 08eb08c..3e85c11 100644
--- a/build/linux.yml
+++ b/build/linux.yml
@@ -1,6 +1,5 @@
 parameters:
   target: ''
-  gcc_version: ''
   rust_version: 'stable'
   repo: ''
   tag: ''
@@ -19,7 +18,6 @@ steps:
   env:
     RUST_VERSION: ${{ parameters.rust_version }}
     TARGET: ${{ parameters.target }}
-    GCC_VERSION: ${{ parameters.gcc_version }}
 - script: |
     sudo xcode-select -s /Applications/Xcode_12.2.app
   displayName: Switch to Xcode 12
diff --git a/build/main.yml b/build/main.yml
index 9110deb..ef1e90b 100644
--- a/build/main.yml
+++ b/build/main.yml
@@ -20,7 +20,6 @@ jobs:
     - template: linux.yml
       parameters:
         target: arm-unknown-linux-gnueabihf
-        gcc_version: 4.8
 - job: linux_aarch64
   pool:
     vmImage: 'ubuntu-16.04'
@@ -28,7 +27,6 @@ jobs:
     - template: linux.yml
       parameters:
         target: aarch64-unknown-linux-gnu
-        gcc_version: 4.8
 - job: macOS
   pool:
     vmImage: macOS-latest