From fb739faece01acc1f1be30ca3afdddba3fc91b7b Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Wed, 9 Nov 2016 17:00:48 -0700
Subject: [PATCH] Fix build, remove cfg(redox)

---
 Makefile                | 4 ++++
 drivers/pcid/Cargo.toml | 5 ++++-
 krustc.sh               | 2 +-
 krustdoc.sh             | 2 +-
 rustc.sh                | 2 +-
 rustdoc.sh              | 2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 9b4c157..3263c47 100644
--- a/Makefile
+++ b/Makefile
@@ -284,6 +284,10 @@ $(BUILD)/libstd.rlib: libstd/Cargo.toml libstd/src/** $(BUILD)/libcore.rlib $(BU
 	$(CARGO) rustc --verbose --manifest-path $< $(CARGOFLAGS) -o $@
 	cp libstd/target/$(TARGET)/release/deps/*.rlib $(BUILD)
 
+#$(BUILD)/libstd.rlib: libstd_real/Cargo.toml rust/src/libstd/** $(BUILD)/libcore.rlib $(BUILD)/liballoc.rlib $(BUILD)/librustc_unicode.rlib $(BUILD)/libcollections.rlib $(BUILD)/librand.rlib $(BUILD)/libopenlibm.a
+#	$(CARGO) rustc --verbose --manifest-path $< $(CARGOFLAGS) -o $@
+#	cp libstd_real/target/$(TARGET)/release/deps/*.rlib $(BUILD)
+
 initfs/bin/%: drivers/%/Cargo.toml drivers/%/src/** $(BUILD)/libstd.rlib
 	mkdir -p initfs/bin
 	$(CARGO) rustc --manifest-path $< $(CARGOFLAGS) -o $@
diff --git a/drivers/pcid/Cargo.toml b/drivers/pcid/Cargo.toml
index e1f0f78..132fc55 100644
--- a/drivers/pcid/Cargo.toml
+++ b/drivers/pcid/Cargo.toml
@@ -4,5 +4,8 @@ version = "0.1.0"
 
 [dependencies]
 redox_syscall = { path = "../../syscall/" }
-rustc-serialize = "0.3"
+rustc-serialize = { git = "https://github.com/jackpot51/rustc-serialize.git" }
 toml = "*"
+
+[replace]
+"rustc-serialize:0.3.20" = { git = "https://github.com/jackpot51/rustc-serialize.git" }
diff --git a/krustc.sh b/krustc.sh
index b7bea64..9c6b5e7 100755
--- a/krustc.sh
+++ b/krustc.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-RUST_BACKTRACE=1 rustc -L build/kernel --cfg redox $*
+RUST_BACKTRACE=1 rustc -L build/kernel $*
diff --git a/krustdoc.sh b/krustdoc.sh
index de4cdb6..8365834 100755
--- a/krustdoc.sh
+++ b/krustdoc.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-RUST_BACKTRACE=1 rustdoc -L build/kernel --cfg redox $*
+RUST_BACKTRACE=1 rustdoc -L build/kernel $*
diff --git a/rustc.sh b/rustc.sh
index 8bfbc4a..fa3e819 100755
--- a/rustc.sh
+++ b/rustc.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-RUST_BACKTRACE=1 rustc -L build/userspace --cfg redox $*
+RUST_BACKTRACE=1 rustc -L build/userspace $*
diff --git a/rustdoc.sh b/rustdoc.sh
index 4eff5a2..f60c41b 100755
--- a/rustdoc.sh
+++ b/rustdoc.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-RUST_BACKTRACE=1 rustdoc -L build/userspace --cfg redox $*
+RUST_BACKTRACE=1 rustdoc -L build/userspace $*