From ae2fb4217c356ed8b526d95b4ad753adab2d7a3d Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Mon, 19 Jun 2017 16:28:42 -0600
Subject: [PATCH] Go back to using gcc.sh from libc-artifacts

---
 .cargo/config  | 2 +-
 .gitmodules    | 5 +++++
 config.sh      | 2 +-
 libc-artifacts | 1 +
 pkgutils       | 2 +-
 setup.sh       | 3 +++
 6 files changed, 12 insertions(+), 3 deletions(-)
 create mode 160000 libc-artifacts

diff --git a/.cargo/config b/.cargo/config
index cc387d318..f9f6b985a 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,3 +1,3 @@
 [target.x86_64-unknown-redox]
-linker = "x86_64-elf-redox-gcc"
+linker = "libc-artifacts/gcc.sh"
 rustflags = []
diff --git a/.gitmodules b/.gitmodules
index 4f9444d73..c335c458c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,8 @@
+[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
+	branch = master
diff --git a/config.sh b/config.sh
index 724ae9c82..89c5987a3 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="x86_64-elf-redox-gcc"
+export CC="$ROOT/libc-artifacts/gcc.sh"
 export XARGO_HOME="$ROOT/xargo-home"
diff --git a/libc-artifacts b/libc-artifacts
new file mode 160000
index 000000000..c67b055af
--- /dev/null
+++ b/libc-artifacts
@@ -0,0 +1 @@
+Subproject commit c67b055af98c5f9d3afbe62479e8201f01f941cc
diff --git a/pkgutils b/pkgutils
index 9b212cd5c..0c3769fd4 160000
--- a/pkgutils
+++ b/pkgutils
@@ -1 +1 @@
-Subproject commit 9b212cd5c2c14e5dcbb6fc2e6d5bea59e329a76d
+Subproject commit 0c3769fd4ecf17fb9b47ee800e80b92162628e90
diff --git a/setup.sh b/setup.sh
index bb8e5218e..9f30c1d75 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 set -e
 
+echo "Downloading latest libc-artifacts"
+git submodule update --init --remote libc-artifacts
+
 echo "Downloading latest pkgutils"
 git submodule update --init --remote pkgutils
 cargo update --manifest-path pkgutils/Cargo.toml
-- 
GitLab