From 96346761abfdf783d2b3202533a04db348e32b9f Mon Sep 17 00:00:00 2001
From: KokaKiwi <kokakiwi@kokakiwi.net>
Date: Thu, 28 Nov 2013 00:14:19 +0100
Subject: [PATCH] Fix build.

---
 Makefile         | 4 ++--
 cat/cat.rs       | 2 +-
 env/env.rs       | 6 +++---
 whoami/whoami.rs | 1 -
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 9f68e1a64..d66142738 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ command     = sh -c '$(1)'
 
 # Main exe build rule
 define EXE_BUILD
-build/$(1): $(1)/$(1).rs
+build/$(1): build $(1)/$(1).rs
 	$(call command,$(RUSTC) $(RUSTCFLAGS) -o build/$(1) $(1)/$(1).rs)
 endef
 
@@ -26,7 +26,7 @@ test_$(1): tmp/$(1)_test build/$(1)
 	$(call command,tmp/$(1)_test)
 
 tmp/$(1)_test: $(1)/test.rs
-	$(RUSTC) $(RUSTCFLAGS) -o tmp/$(1)_test $(1)/test.rs
+	$(call command,$(RUSTC) $(RUSTCFLAGS) --test -o tmp/$(1)_test $(1)/test.rs)
 endef
 
 # Main rules
diff --git a/cat/cat.rs b/cat/cat.rs
index f52c0b489..aa7f60c20 100644
--- a/cat/cat.rs
+++ b/cat/cat.rs
@@ -1,5 +1,5 @@
 #[link(name="cat", vers="1.0.0", author="Seldaek")];
-#[feature(managed_boxes)]
+#[feature(managed_boxes)];
 
 /*
  * This file is part of the uutils coreutils package.
diff --git a/env/env.rs b/env/env.rs
index a1b23b9b8..980952c57 100644
--- a/env/env.rs
+++ b/env/env.rs
@@ -75,7 +75,7 @@ fn main() {
 
         if wait_cmd {
             // we still accept NAME=VAL here but not other options
-            let mut sp = opt.splitn_iter('=', 1);
+            let mut sp = opt.splitn('=', 1);
             let name = sp.next();
             let value = sp.next();
 
@@ -119,7 +119,7 @@ fn main() {
                 continue;
             }
 
-            let mut chars = opt.iter();
+            let mut chars = opt.chars();
             chars.next();
 
             for c in chars {
@@ -146,7 +146,7 @@ fn main() {
             }
         } else {
             // is it a NAME=VALUE like opt ?
-            let mut sp = opt.splitn_iter('=', 1);
+            let mut sp = opt.splitn('=', 1);
             let name = sp.next();
             let value = sp.next();
 
diff --git a/whoami/whoami.rs b/whoami/whoami.rs
index 750d8036b..ff7275cdb 100644
--- a/whoami/whoami.rs
+++ b/whoami/whoami.rs
@@ -28,7 +28,6 @@ extern {
     pub fn getpwuid(uid: libc::c_int) -> *c_passwd;
 }
 
-#[fixed_stack_segment]
 unsafe fn getusername() -> ~str {
     let passwd: *c_passwd = getpwuid(geteuid());