From e50070b3f34fc4d54bf4e6f24a791add1f2137d5 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 15 Jun 2017 20:43:38 -0600 Subject: [PATCH] Remove libc-artifacts, use cross compiler by default --- .cargo/config | 2 +- .gitmodules | 4 ---- config.sh | 2 +- libc-artifacts | 1 - 4 files changed, 2 insertions(+), 7 deletions(-) delete mode 160000 libc-artifacts 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/.gitmodules b/.gitmodules index 7b1c83abe..4f9444d73 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,3 @@ -[submodule "libc-artifacts"] - path = libc-artifacts - url = https://github.com/redox-os/libc-artifacts.git - branch = master [submodule "pkgutils"] path = pkgutils url = https://github.com/redox-os/pkgutils.git diff --git a/config.sh b/config.sh index 89c5987a3..724ae9c82 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 CC="x86_64-elf-redox-gcc" export XARGO_HOME="$ROOT/xargo-home" diff --git a/libc-artifacts b/libc-artifacts deleted file mode 160000 index c26b21e3b..000000000 --- a/libc-artifacts +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c26b21e3b6716e0af95a985888dbf19ec864b4a9