Clean up gcc_version

microsoft · Nov 17, 2020 · fb6fc3c · fb6fc3c
1 parent 5e4f58b
commit fb6fc3c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git 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
@@ -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
@@ -20,15 +20,13 @@ jobs:
     - template: linux.yml
       parameters:
         target: arm-unknown-linux-gnueabihf
-        gcc_version: 4.8
 - job: linux_aarch64
   pool:
     vmImage: 'ubuntu-16.04'
   steps:
     - template: linux.yml
       parameters:
         target: aarch64-unknown-linux-gnu
-        gcc_version: 4.8
 - job: macOS
   pool:
     vmImage: macOS-latest