diff options
Diffstat (limited to 'src/rustc')
| -rw-r--r-- | src/rustc/back/rpath.rs | 4 | ||||
| -rw-r--r-- | src/rustc/middle/trans/base.rs | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/rustc/back/rpath.rs b/src/rustc/back/rpath.rs index 675f1c43745..06376c18cb0 100644 --- a/src/rustc/back/rpath.rs +++ b/src/rustc/back/rpath.rs @@ -188,9 +188,7 @@ fn minimize_rpaths(rpaths: [str]) -> [str] { ret minimized; } -#[cfg(target_os = "linux")] -#[cfg(target_os = "macos")] -#[cfg(target_os = "freebsd")] +#[cfg(unix)] mod test { #[test] fn test_rpaths_to_flags() { diff --git a/src/rustc/middle/trans/base.rs b/src/rustc/middle/trans/base.rs index 34845ceb45a..208e05de886 100644 --- a/src/rustc/middle/trans/base.rs +++ b/src/rustc/middle/trans/base.rs @@ -5061,13 +5061,9 @@ fn create_main_wrapper(ccx: @crate_ctxt, sp: span, main_llfn: ValueRef, } fn create_entry_fn(ccx: @crate_ctxt, rust_main: ValueRef) { - #[cfg(target_os = "win32")] + #[cfg(windows)] fn main_name() -> str { ret "WinMain@16"; } - #[cfg(target_os = "macos")] - fn main_name() -> str { ret "main"; } - #[cfg(target_os = "linux")] - fn main_name() -> str { ret "main"; } - #[cfg(target_os = "freebsd")] + #[cfg(unix)] fn main_name() -> str { ret "main"; } let llfty = T_fn([ccx.int_type, ccx.int_type], ccx.int_type); let llfn = decl_cdecl_fn(ccx.llmod, main_name(), llfty); |