Merge pull request #1349 from lht/driver

Separate driver rustc and librustc

Author: graydon

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

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 $@

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))