Skip to content

Commit fac0d9d

Browse files
committed
Decides main name by target
1 parent f064048 commit fac0d9d

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/librustc/middle/trans/base.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -2243,17 +2243,17 @@ pub fn create_main_wrapper(ccx: @CrateContext,
22432243
}
22442244
22452245
fn create_entry_fn(ccx: @CrateContext, rust_main: ValueRef) {
2246-
#[cfg(windows)]
2247-
fn main_name() -> ~str { return ~"WinMain@16"; }
2248-
#[cfg(unix)]
2249-
fn main_name() -> ~str { return ~"main"; }
22502246
let llfty = T_fn(~[ccx.int_type, T_ptr(T_ptr(T_i8()))], ccx.int_type);
22512247
22522248
// FIXME #4404 android JNI hacks
22532249
let llfn = if *ccx.sess.building_library {
22542250
decl_cdecl_fn(ccx.llmod, ~"amain", llfty)
22552251
} else {
2256-
decl_cdecl_fn(ccx.llmod, main_name(), llfty)
2252+
let main_name = match ccx.sess.targ_cfg.os {
2253+
session::os_win32 => ~"WinMain@16",
2254+
_ => ~"main",
2255+
};
2256+
decl_cdecl_fn(ccx.llmod, main_name, llfty)
22572257
};
22582258
let llbb = str::as_c_str(~"top", |buf| {
22592259
unsafe {

0 commit comments

Comments
 (0)