Skip to content
Snippets Groups Projects
Commit 7a1e2a62 authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Merge branch 'new-toolchain' into 'master'

Support use of new cross compiler

See merge request !203
parents cee4449f 0e667c5f
No related branches found
No related tags found
No related merge requests found
.idea/
prefix/
sysroot/
**/target/
......@@ -28,13 +28,14 @@ build:redox:
# This can't be in before_script because that overrides
# the global before_script.
- apt-get update -qq
- apt-get install -qq apt-transport-https build-essential curl git gnupg software-properties-common
- apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AA12E97F0881517F
- add-apt-repository 'deb https://static.redox-os.org/toolchain/apt /'
- apt-get update -qq && apt-get install -qq x86-64-unknown-redox-gcc
- apt-get install -qq tar
- rm -rf prefix
- mkdir prefix
- wget -O - https://static.redox-os.org/toolchain/x86_64-unknown-redox/gcc-install.tar.gz |
tar --extract --gzip --directory prefix
# Main script
- make all
- env PATH="${PWD}/prefix/bin:$PATH" make all
test:linux:
stage: test
......
language: rust
env:
-
- TARGET=aarch64-unknown-linux-gnu
- TARGET=x86_64-unknown-redox
rust:
- nightly
install:
- if [ $TARGET == "aarch64-unknown-linux-gnu" ]; then sudo apt-get install gcc-aarch64-linux-gnu; fi
before_script:
- rustup component add rustfmt-preview
- if [ -n "$TARGET" ]; then rustup target add $TARGET; fi
script:
- ./ci.sh
notifications:
email: false
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment