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

Commit

Permalink
Change prefix; enable multilib
Browse files Browse the repository at this point in the history
  • Loading branch information
rleh committed Sep 27, 2020
1 parent 1ad9972 commit 97187a9
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
17 changes: 9 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ jobs:
name: Git Clone
command: |
git clone --recursive --jobs 16 --quiet https://github.com/riscv/riscv-gnu-toolchain
no_output_timeout: 20m
- run:
name: Configure
command: |
cd riscv-gnu-toolchain
./configure --prefix=/opt/riscv-gcc
./configure --prefix=/opt/modm-riscv-gcc --enable-multilib
- run:
name: Build
command: |
Expand All @@ -22,9 +23,9 @@ jobs:
- run:
name: Compiling test files
command: |
/opt/riscv-gcc/bin/riscv64-unknown-elf-g++ --version
/opt/modm-riscv-gcc/bin/riscv64-unknown-elf-g++ --version
echo "int main() { return 0;}" > main1.cpp
/opt/riscv-gcc/bin/riscv64-unknown-elf-g++ main1.cpp
/opt/modm-riscv-gcc/bin/riscv64-unknown-elf-g++ main1.cpp
#- run:
# name: Fake toolchain
# command: |
Expand All @@ -34,14 +35,14 @@ jobs:
name: Create Tarball
command: |
mkdir -p workspace
tar cjf workspace/riscv-gcc.tar.bz2 -C /opt riscv-gcc
tar cjf workspace/modm-riscv-gcc.tar.bz2 -C /opt modm-riscv-gcc
- store_artifacts:
path: workspace/riscv-gcc.tar.bz2
destination: riscv-gcc.tar.bz2
path: workspace/modm-riscv-gcc.tar.bz2
destination: modm-riscv-gcc.tar.bz2
- persist_to_workspace:
root: workspace
paths:
- riscv-gcc.tar.bz2
- modm-riscv-gcc.tar.bz2

deploy:
docker:
Expand All @@ -54,7 +55,7 @@ jobs:
command: go get github.com/tcnksm/ghr
- run:
name: Deploy
command: ghr -t $GITHUB_TOKEN -u $CIRCLE_PROJECT_USERNAME -r $CIRCLE_PROJECT_REPONAME $CIRCLE_TAG workspace/riscv-gcc.tar.bz2
command: ghr -t $GITHUB_TOKEN -u $CIRCLE_PROJECT_USERNAME -r $CIRCLE_PROJECT_REPONAME $CIRCLE_TAG workspace/modm-riscv-gcc.tar.bz2

workflows:
version: 2
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@

## Installation

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

```sh
tar xf riscv-gcc.tar.bz2 --directory /opt
tar xf modm-riscv-gcc.tar.bz2 --directory /opt
```

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

```sh
export PATH="/opt/riscv-gcc/bin:$PATH"
export PATH="/opt/modm-riscv-gcc/bin:$PATH"
```

## Building locally with Docker
Expand Down Expand Up @@ -47,7 +47,7 @@ cd docker-riscv-gcc
time ./build.sh
```

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

## Building in CircleCI

Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ git clone --recursive https://github.com/riscv/riscv-gnu-toolchain
cd riscv-gnu-toolchain

# Configure
./configure --prefix=/opt/riscv-gcc
./configure --prefix=/opt/modm-riscv-gcc --enable-multilib

# Build
make -j4

0 comments on commit 97187a9

Please sign in to comment.