From c124404d0e1c8ce922a702661175495a65af1ea8 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 13 May 2011 13:51:13 -0400 Subject: 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. --- src/comp/driver/rustc.rs | 6 +++--- src/lib/linux_os.rs | 2 +- src/lib/macos_os.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs index 6592c23a..4940e7a0 100644 --- a/src/comp/driver/rustc.rs +++ b/src/comp/driver/rustc.rs @@ -35,11 +35,11 @@ fn default_environment(session::session sess, str argv0, str input) -> eval::env { - auto libc = "libc::so"; + auto libc = "libc.so"; alt (sess.get_targ_cfg().os) { case (session::os_win32) { libc = "msvcrt.dll"; } - case (session::os_macos) { libc = "libc::dylib"; } - case (session::os_linux) { libc = "libc::so.6"; } + case (session::os_macos) { libc = "libc.dylib"; } + case (session::os_linux) { libc = "libc.so.6"; } } ret diff --git a/src/lib/linux_os.rs b/src/lib/linux_os.rs index 3b074e41..2a8921e3 100644 --- a/src/lib/linux_os.rs +++ b/src/lib/linux_os.rs @@ -4,7 +4,7 @@ import _vec::vbuf; // FIXME Somehow merge stuff duplicated here and macosx_os.rs. Made difficult // by https://github.com/graydon/rust/issues#issue/268 -native mod libc = "libc::so.6" { +native mod libc = "libc.so.6" { fn open(sbuf s, int flags, uint mode) -> int; fn read(int fd, vbuf buf, uint count) -> int; diff --git a/src/lib/macos_os.rs b/src/lib/macos_os.rs index 2ad89319..04a143b8 100644 --- a/src/lib/macos_os.rs +++ b/src/lib/macos_os.rs @@ -1,7 +1,7 @@ import _str::sbuf; import _vec::vbuf; -native mod libc = "libc::dylib" { +native mod libc = "libc.dylib" { fn open(sbuf s, int flags, uint mode) -> int; fn read(int fd, vbuf buf, uint count) -> int; -- cgit v1.2.3