---

yaml
---
r: 6871
b: refs/heads/master
c: bc95ccb
h: refs/heads/master
i:
  6869: cd7da11
  6867: bdbd51c
  6863: 5b9eff2
v: v3

Author: lht

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96d7f83eb0c87453d57e5a71959d0d74a9e500ca
+refs/heads/master: bc95ccb53694a8ad992ea5bf58e41a22c4e7b7d6

trunk/Makefile.in

@@ -209,8 +209,11 @@ STDLIB_INPUTS := $(wildcard $(addprefix $(S)src/libstd/,          \
 ######################################################################
 
 COMPILER_CRATE := $(S)src/comp/rustc.rc
-COMPILER_INPUTS := $(wildcard $(addprefix $(S)src/comp/, \
-                                rustc.rc *.rs */*.rs */*/*.rs))
+COMPILER_INPUTS := $(filter-out $(S)src/comp/driver/rustc.rs,         \
+				$(wildcard $(addprefix $(S)src/comp/, \
+                                rustc.rc *.rs */*.rs */*/*.rs)))
+
+RUSTC_INPUTS := $(S)src/comp/driver/rustc.rs
 
 ######################################################################
 # LLVM macros

trunk/mk/perf.mk

@@ -2,8 +2,9 @@
 ifdef CFG_PERF_TOOL
 rustc-perf$(X): $(CFG_HOST_TRIPLE)/stage2/bin/rustc$(X)
 	@$(call E, perf compile: $@)
-	$(PERF_STAGE2_T_$(CFG_HOST_TRIPLE)_H_$(CFG_HOST_TRIPLE)) -o $@ $(COMPILER_CRATE) >rustc-perf.err 2>&1
-	$(Q)rm -f $@
+	$(PERF_STAGE2_T_$(CFG_HOST_TRIPLE)_H_$(CFG_HOST_TRIPLE)) --lib \
+		 -o $@ $(COMPILER_CRATE) >rustc-perf.err 2>&1
+	$(Q)rm -f $(LIBRUSTC_GLOB)
 else
 rustc-perf$(X): $(CFG_HOST_TRIPLE)/stage2/bin/rustc$(X)
 	$(Q)touch $@

trunk/mk/target.mk

@@ -46,17 +46,14 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUSTLLVM): \
 	$$(Q)cp $$< $$@
 
 $$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X):				\
-		$$(COMPILER_CRATE) $$(COMPILER_INPUTS)		\
-		$$(TSREQ$(1)_T_$(2)_H_$(3))					\
-		$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUSTLLVM)	\
-		$$(TCORELIB_DEFAULT$(1)_T_$(2)_H_$(3))      \
-		$$(TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3))
+		$$(RUSTC_INPUTS)                                \
+		$$(TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3))
 	@$$(call E, compile_and_link: $$@)
 	$$(STAGE$(1)_T_$(2)_H_$(3))  -o $$@ $$<
 
 $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC):		\
 		$$(COMPILER_CRATE) $$(COMPILER_INPUTS)		\
-		$$(TSREQ$(1)_T_$(2)_H_$(3))					\
+		$$(TSREQ$(1)_T_$(2)_H_$(3))			\
 		$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUSTLLVM)	\
 		$$(TCORELIB_DEFAULT$(1)_T_$(2)_H_$(3))      \
 		$$(TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3))

trunk/src/comp/back/rpath.rs

@@ -3,6 +3,7 @@ import std::fs;
 import std::os_fs;
 import vec;
 import std::map;
+import std::math;
 import str;
 import uint;
 import metadata::cstore;
@@ -128,7 +129,7 @@ fn get_relative_to(abs1: fs::path, abs2: fs::path) -> fs::path {
     assert len1 > 0u;
     assert len2 > 0u;
 
-    let max_common_path = float::min(len1, len2) - 1u;
+    let max_common_path = math::min(len1, len2) - 1u;
     let start_idx = 0u;
     while start_idx < max_common_path
         && split1[start_idx] == split2[start_idx] {