Skip to content

Commit b13192d

Browse files
committed
install a newer gcc
1 parent f2c5e2e commit b13192d

File tree

2 files changed

+14
-32
lines changed

2 files changed

+14
-32
lines changed

cortex-m-rt/.travis.yml

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@ matrix:
77

88
- env: TARGET=thumbv6m-none-eabi
99
rust: stable
10-
addons:
11-
apt:
12-
packages:
13-
- gcc-arm-none-eabi
10+
sudo: true
1411
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
1512

1613
- env: TARGET=thumbv6m-none-eabi CC=clang
@@ -19,10 +16,7 @@ matrix:
1916

2017
- env: TARGET=thumbv7m-none-eabi
2118
rust: stable
22-
addons:
23-
apt:
24-
packages:
25-
- gcc-arm-none-eabi
19+
sudo: true
2620
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
2721

2822
- env: TARGET=thumbv7m-none-eabi CC=clang
@@ -31,10 +25,7 @@ matrix:
3125

3226
- env: TARGET=thumbv7em-none-eabi
3327
rust: stable
34-
addons:
35-
apt:
36-
packages:
37-
- gcc-arm-none-eabi
28+
sudo: true
3829
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
3930

4031
- env: TARGET=thumbv7em-none-eabi CC=clang
@@ -43,10 +34,7 @@ matrix:
4334

4435
- env: TARGET=thumbv7em-none-eabihf
4536
rust: stable
46-
addons:
47-
apt:
48-
packages:
49-
- gcc-arm-none-eabi
37+
sudo: true
5038
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
5139

5240
- env: TARGET=thumbv7em-none-eabihf CC=clang
@@ -55,34 +43,22 @@ matrix:
5543

5644
- env: TARGET=thumbv6m-none-eabi
5745
rust: nightly
58-
addons:
59-
apt:
60-
packages:
61-
- gcc-arm-none-eabi
46+
sudo: true
6247
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
6348

6449
- env: TARGET=thumbv7m-none-eabi
6550
rust: nightly
66-
addons:
67-
apt:
68-
packages:
69-
- gcc-arm-none-eabi
51+
sudo: true
7052
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
7153

7254
- env: TARGET=thumbv7em-none-eabi
7355
rust: nightly
74-
addons:
75-
apt:
76-
packages:
77-
- gcc-arm-none-eabi
56+
sudo: true
7857
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
7958

8059
- env: TARGET=thumbv7em-none-eabihf
8160
rust: nightly
82-
addons:
83-
apt:
84-
packages:
85-
- gcc-arm-none-eabi
61+
sudo: true
8662
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
8763

8864
before_install: set -e

cortex-m-rt/ci/install.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ set -euxo pipefail
33
main() {
44
if [ $TARGET != x86_64-unknown-linux-gnu ]; then
55
rustup target add $TARGET
6+
7+
if [ ${CC:-gcc} = gcc ]; then
8+
sudo add-apt-repository ppa:team-gcc-arm-embedded/ppa -y
9+
sudo apt-get update -q
10+
sudo apt-get install gcc-arm-embedded -y
11+
fi
612
fi
713
}
814

0 commit comments

Comments
 (0)