Skip to content

Commit 429116e

Browse files
committed
---
yaml --- r: 5652 b: refs/heads/master c: e503710 h: refs/heads/master v: v3
1 parent 37fe870 commit 429116e

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 6e654564db85819ef401eeb4e950acf02096796c
2+
refs/heads/master: e50371060b5973dffb594494e369a77ce55e7c6d

trunk/src/comp/back/link.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ fn link_binary(sess: session::session,
524524
// The invocations of gcc share some flags across platforms
525525

526526
let gcc_args =
527-
[stage, "-Lrt", "-lrustrt", "-m32", "-o", saved_out_filename,
527+
[stage, "-m32", "-o", saved_out_filename,
528528
saved_out_filename + ".o"];
529529
let lib_cmd;
530530

@@ -581,8 +581,10 @@ fn link_binary(sess: session::session,
581581
// FIXME: why do we hardcode -lm?
582582
gcc_args += ["-lm", main];
583583
}
584-
// We run 'gcc' here
585584

585+
gcc_args += ["-Lrt", "-lrustrt"];
586+
587+
// We run 'gcc' here
586588
let err_code = run::run_program(prog, gcc_args);
587589
if 0 != err_code {
588590
sess.err(#fmt["linking with gcc failed with code %d", err_code]);

0 commit comments

Comments
 (0)