Skip to content
This repository was archived by the owner on Mar 6, 2023. It is now read-only.

Commit 97187a9

Browse files
committed
Change prefix; enable multilib
1 parent 1ad9972 commit 97187a9

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

.circleci/config.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ jobs:
99
name: Git Clone
1010
command: |
1111
git clone --recursive --jobs 16 --quiet https://github.com/riscv/riscv-gnu-toolchain
12+
no_output_timeout: 20m
1213
- run:
1314
name: Configure
1415
command: |
1516
cd riscv-gnu-toolchain
16-
./configure --prefix=/opt/riscv-gcc
17+
./configure --prefix=/opt/modm-riscv-gcc --enable-multilib
1718
- run:
1819
name: Build
1920
command: |
@@ -22,9 +23,9 @@ jobs:
2223
- run:
2324
name: Compiling test files
2425
command: |
25-
/opt/riscv-gcc/bin/riscv64-unknown-elf-g++ --version
26+
/opt/modm-riscv-gcc/bin/riscv64-unknown-elf-g++ --version
2627
echo "int main() { return 0;}" > main1.cpp
27-
/opt/riscv-gcc/bin/riscv64-unknown-elf-g++ main1.cpp
28+
/opt/modm-riscv-gcc/bin/riscv64-unknown-elf-g++ main1.cpp
2829
#- run:
2930
# name: Fake toolchain
3031
# command: |
@@ -34,14 +35,14 @@ jobs:
3435
name: Create Tarball
3536
command: |
3637
mkdir -p workspace
37-
tar cjf workspace/riscv-gcc.tar.bz2 -C /opt riscv-gcc
38+
tar cjf workspace/modm-riscv-gcc.tar.bz2 -C /opt modm-riscv-gcc
3839
- store_artifacts:
39-
path: workspace/riscv-gcc.tar.bz2
40-
destination: riscv-gcc.tar.bz2
40+
path: workspace/modm-riscv-gcc.tar.bz2
41+
destination: modm-riscv-gcc.tar.bz2
4142
- persist_to_workspace:
4243
root: workspace
4344
paths:
44-
- riscv-gcc.tar.bz2
45+
- modm-riscv-gcc.tar.bz2
4546

4647
deploy:
4748
docker:
@@ -54,7 +55,7 @@ jobs:
5455
command: go get github.com/tcnksm/ghr
5556
- run:
5657
name: Deploy
57-
command: ghr -t $GITHUB_TOKEN -u $CIRCLE_PROJECT_USERNAME -r $CIRCLE_PROJECT_REPONAME $CIRCLE_TAG workspace/riscv-gcc.tar.bz2
58+
command: ghr -t $GITHUB_TOKEN -u $CIRCLE_PROJECT_USERNAME -r $CIRCLE_PROJECT_REPONAME $CIRCLE_TAG workspace/modm-riscv-gcc.tar.bz2
5859

5960
workflows:
6061
version: 2

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44

55
## Installation
66

7-
Download the latest `riscv-gcc.tar.bz2` from [Releases](https://github.com/modm-ext/docker-riscv-gcc/releases)
7+
Download the latest `modm-riscv-gcc.tar.bz2` from [Releases](https://github.com/modm-ext/docker-riscv-gcc/releases)
88
and unpack it to `/opt`:
99

1010
```sh
11-
tar xf riscv-gcc.tar.bz2 --directory /opt
11+
tar xf modm-riscv-gcc.tar.bz2 --directory /opt
1212
```
1313

1414
Add the `bin/` directorie(s?) to your `$PATH`,
1515
e.g. by adding the following line to your `~/.bashrc` file:
1616

1717
```sh
18-
export PATH="/opt/riscv-gcc/bin:$PATH"
18+
export PATH="/opt/modm-riscv-gcc/bin:$PATH"
1919
```
2020

2121
## Building locally with Docker
@@ -47,7 +47,7 @@ cd docker-riscv-gcc
4747
time ./build.sh
4848
```
4949

50-
The toolchain will be in `/opt/riscv-gcc`.
50+
The toolchain will be in `/opt/modm-riscv-gcc`.
5151

5252
## Building in CircleCI
5353

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ git clone --recursive https://github.com/riscv/riscv-gnu-toolchain
55
cd riscv-gnu-toolchain
66

77
# Configure
8-
./configure --prefix=/opt/riscv-gcc
8+
./configure --prefix=/opt/modm-riscv-gcc --enable-multilib
99

1010
# Build
1111
make -j4

0 commit comments

Comments
 (0)