From ae09d5afbcf8b875f4bce30ffe9de70286832efb Mon Sep 17 00:00:00 2001 From: Jeremy Soller <jackpot51@gmail.com> Date: Mon, 19 Jun 2017 19:48:35 -0600 Subject: [PATCH] Move xargo home to xargo, use cross compiler --- .cargo/config | 2 +- .gitignore | 2 +- clean.sh | 2 +- config.sh | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.cargo/config b/.cargo/config index f9f6b985a..cc387d318 100644 --- a/.cargo/config +++ b/.cargo/config @@ -1,3 +1,3 @@ [target.x86_64-unknown-redox] -linker = "libc-artifacts/gcc.sh" +linker = "x86_64-elf-redox-gcc" rustflags = [] diff --git a/.gitignore b/.gitignore index 76a605ed3..64dda0f65 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,4 @@ stage.sig stage.tar stage.tar.gz stage.toml -xargo-home +xargo diff --git a/clean.sh b/clean.sh index 67d49a1d8..0bf362f81 100755 --- a/clean.sh +++ b/clean.sh @@ -15,4 +15,4 @@ do ./cook.sh "$recipe" distclean done -rm -rf xargo-home +rm -rf xargo diff --git a/config.sh b/config.sh index 89c5987a3..01976e491 100755 --- a/config.sh +++ b/config.sh @@ -7,5 +7,5 @@ export TARGET=x86_64-unknown-redox # Automatic variables ROOT="$(cd `dirname "$0"` && pwd)" REPO="$ROOT/repo/$TARGET" -export CC="$ROOT/libc-artifacts/gcc.sh" -export XARGO_HOME="$ROOT/xargo-home" +export CC="x86_64-elf-redox-gcc" +export XARGO_HOME="$ROOT/xargo" -- GitLab