about summary refs log tree commit diff
path: root/src/comp/driver
diff options
context:
space:
mode:
authorRafael Ávila de Espíndola <respindola@mozilla.com>2011-06-17 15:32:41 -0400
committerRafael Ávila de Espíndola <respindola@mozilla.com>2011-06-17 15:34:59 -0400
commit342dbd7abef5330be9fb8b75efe55b9ac2fa1a65 (patch)
tree04ecf625499cb6c147bca449c460898f37d8af9f /src/comp/driver
parente43a3755dd062c4e0ed5727bec764e84f2fb7690 (diff)
downloadrust-342dbd7abef5330be9fb8b75efe55b9ac2fa1a65.tar.gz
rust-342dbd7abef5330be9fb8b75efe55b9ac2fa1a65.zip
Put std in stageN/lib. This avoids windows trying to load stageN/std.ll when
stageN/runstc.exe is run.
Diffstat (limited to 'src/comp/driver')
-rw-r--r--src/comp/driver/rustc.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs
index 0a340e4758e..24539f364fe 100644
--- a/src/comp/driver/rustc.rs
+++ b/src/comp/driver/rustc.rs
@@ -205,7 +205,7 @@ fn build_target_config() -> @session::config {
 fn build_session_options(str binary, getopts::match match, str binary_dir) ->
    @session::options {
     auto shared = opt_present(match, "shared");
-    auto library_search_paths = [binary_dir];
+    auto library_search_paths = [binary_dir + "/lib"];
     library_search_paths += getopts::opt_strs(match, "L");
     auto output_type =
         if (opt_present(match, "parse-only")) {
@@ -395,7 +395,7 @@ fn main(vec[str] args) {
     if (sopts.output_type == link::output_type_exe) {
         let str glu = binary_dir + "/glue.o";
         let str main = "rt/main.o";
-        let str stage = "-L" + binary_dir;
+        let str stage = "-L" + binary_dir + "/lib";
         let vec[str] gcc_args;
         let str prog = "gcc";
         // The invocations of gcc share some flags across platforms