rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add FIXME's for #4404. Android JNI hacks

Browse Source
This commit is contained in:
Brian Anderson
2013-01-09 12:08:42 -08:00
parent 4fb4be8f17
commit e6b57f858f
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/librustc/middle/trans/base.rs
View File

@@ -2152,6 +2152,7 @@ fn register_fn_fuller(ccx: @crate_ctxt,
let llfn: ValueRef = decl_fn(ccx.llmod, copy ps, cc, llfty); let llfn: ValueRef = decl_fn(ccx.llmod, copy ps, cc, llfty);
ccx.item_symbols.insert(node_id, ps); ccx.item_symbols.insert(node_id, ps);
// FIXME #4404 android JNI hacks
let is_main = is_main_name(path) && (!ccx.sess.building_library || let is_main = is_main_name(path) && (!ccx.sess.building_library ||
(ccx.sess.building_library && (ccx.sess.building_library &&
ccx.sess.targ_cfg.os == session::os_android)); ccx.sess.targ_cfg.os == session::os_android));
@@ -2205,6 +2206,7 @@ fn create_main_wrapper(ccx: @crate_ctxt, sp: span, main_llfn: ValueRef) {
fn main_name() -> ~str { return ~"main"; } fn main_name() -> ~str { return ~"main"; }
let llfty = T_fn(~[ccx.int_type, ccx.int_type], ccx.int_type); let llfty = T_fn(~[ccx.int_type, ccx.int_type], ccx.int_type);
// FIXME #4404 android JNI hacks
let llfn = if ccx.sess.building_library { let llfn = if ccx.sess.building_library {
decl_cdecl_fn(ccx.llmod, ~"amain", llfty) decl_cdecl_fn(ccx.llmod, ~"amain", llfty)
} else { } else {