Merge the stage1,2,3.mk files into a common definition in stageN.mk, more rearrangement of host/target libs.

2 files changed, 2 insertions, 2 deletions

diff --git a/src/comp/back/link.rs b/src/comp/back/link.rs
index aa0f71ff8e2..ab9f47e3cc0 100644
--- a/src/comp/back/link.rs
+++ b/src/comp/back/link.rs
@@ -41,7 +41,7 @@ fn llvm_err(session::session sess, str msg) {
 }
 
 fn link_intrinsics(session::session sess, ModuleRef llmod) {
-    auto path = fs::connect(sess.get_opts().sysroot, "intrinsics.bc");
+    auto path = fs::connect(sess.get_opts().sysroot, "lib/intrinsics.bc");
     auto membuf =
         llvm::LLVMRustCreateMemoryBufferWithContentsOfFile(str::buf(path));
     if (membuf as uint == 0u) {
diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs
index 9d195c44ada..b810fbecc72 100644
--- a/src/comp/driver/rustc.rs
+++ b/src/comp/driver/rustc.rs
@@ -508,7 +508,7 @@ fn main(vec[str] args) {
     }
 
     let str glu = binary_dir + "/lib/glue.o";
-    let str main = "rt/main.o";
+    let str main = binary_dir + "/lib/main.o";
     let str stage = "-L" + binary_dir + "/lib";
     let str prog = "gcc";
     // The invocations of gcc share some flags across platforms