From c001d1e495c8fca23f582f6e25710c0f3639d00b Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Thu, 29 Dec 2016 21:45:08 -0700
Subject: [PATCH] Revert change to userspace target (since it does not override
 the rustc default)

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 259a624..0933640 100644
--- a/Makefile
+++ b/Makefile
@@ -19,10 +19,10 @@ KCARGOFLAGS=--target $(KTARGET) --release -- -C soft-float
 TARGET=$(ARCH)-unknown-redox
 BUILD=build/userspace
 RUSTC=./rustc.sh
-RUSTCFLAGS=--target $(TARGET) -C opt-level=2 -C debuginfo=0
+RUSTCFLAGS=--target targets/$(TARGET).json -C opt-level=2 -C debuginfo=0
 RUSTDOC=./rustdoc.sh
 CARGO=RUSTC="$(RUSTC)" RUSTDOC="$(RUSTDOC)" cargo
-CARGOFLAGS=--target $(TARGET) --release --
+CARGOFLAGS=--target targets/$(TARGET).json --release --
 
 # Default targets
 .PHONY: all live iso clean doc ref test update pull qemu bochs drivers schemes binutils coreutils extrautils netutils userutils wireshark FORCE