Skip to content

Commit c124404

Browse files
committed
Fix naming of libc that was mangled by recent module changes
It doesn't appear that rustc makes use of these strings so it didn't actually break anything yet.
1 parent 8a8f68a commit c124404

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/comp/driver/rustc.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ fn default_environment(session::session sess,
3535
str argv0,
3636
str input) -> eval::env {
3737

38-
auto libc = "libc::so";
38+
auto libc = "libc.so";
3939
alt (sess.get_targ_cfg().os) {
4040
case (session::os_win32) { libc = "msvcrt.dll"; }
41-
case (session::os_macos) { libc = "libc::dylib"; }
42-
case (session::os_linux) { libc = "libc::so.6"; }
41+
case (session::os_macos) { libc = "libc.dylib"; }
42+
case (session::os_linux) { libc = "libc.so.6"; }
4343
}
4444

4545
ret

src/lib/linux_os.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import _vec::vbuf;
44
// FIXME Somehow merge stuff duplicated here and macosx_os.rs. Made difficult
55
// by https://github.com/graydon/rust/issues#issue/268
66

7-
native mod libc = "libc::so.6" {
7+
native mod libc = "libc.so.6" {
88

99
fn open(sbuf s, int flags, uint mode) -> int;
1010
fn read(int fd, vbuf buf, uint count) -> int;

src/lib/macos_os.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import _str::sbuf;
22
import _vec::vbuf;
33

4-
native mod libc = "libc::dylib" {
4+
native mod libc = "libc.dylib" {
55

66
fn open(sbuf s, int flags, uint mode) -> int;
77
fn read(int fd, vbuf buf, uint count) -> int;

0 commit comments

Comments
 (0)