From 762b95e7770ed9340949404fb9a70bdc705c2ebe Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 29 Dec 2016 21:55:41 -0700 Subject: [PATCH] Revert change to redox userspace targets --- Makefile | 4 ++-- targets/arm-unknown-redox.json => arm-unknown-redox.json | 0 .../x86_64-unknown-redox.json => x86_64-unknown-redox.json | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename targets/arm-unknown-redox.json => arm-unknown-redox.json (100%) rename targets/x86_64-unknown-redox.json => x86_64-unknown-redox.json (100%) diff --git a/Makefile b/Makefile index 0933640..1329ee8 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 targets/$(TARGET).json -C opt-level=2 -C debuginfo=0 +RUSTCFLAGS=--target $(TARGET).json -C opt-level=2 -C debuginfo=0 RUSTDOC=./rustdoc.sh CARGO=RUSTC="$(RUSTC)" RUSTDOC="$(RUSTDOC)" cargo -CARGOFLAGS=--target targets/$(TARGET).json --release -- +CARGOFLAGS=--target $(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 diff --git a/targets/arm-unknown-redox.json b/arm-unknown-redox.json similarity index 100% rename from targets/arm-unknown-redox.json rename to arm-unknown-redox.json diff --git a/targets/x86_64-unknown-redox.json b/x86_64-unknown-redox.json similarity index 100% rename from targets/x86_64-unknown-redox.json rename to x86_64-unknown-redox.json