Browse Source

Support use of new cross compiler

Jeremy Soller 6 years ago
parent
commit
59653ee290
2 changed files with 6 additions and 6 deletions
  1. 1 0
      .gitignore
  2. 5 6
      .gitlab-ci.yml

+ 1 - 0
.gitignore

@@ -1,3 +1,4 @@
 .idea/
+prefix/
 sysroot/
 **/target/

+ 5 - 6
.gitlab-ci.yml

@@ -27,14 +27,13 @@ build:redox:
         # Install x86_64-unknown-redox-gcc
         # 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
+        - 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