浏览代码

Fix garbage env pointer to main on redox

jD91mZM2 6 年之前
父节点
当前提交
23a8855e50
共有 1 个文件被更改,包括 1 次插入3 次删除
  1. 1 3
      src/crt0/src/lib.rs

+ 1 - 3
src/crt0/src/lib.rs

@@ -63,10 +63,7 @@ impl Stack {
 #[no_mangle]
 pub unsafe extern "C" fn _start_rust(sp: &'static Stack) -> ! {
     extern "C" {
-        #[cfg(not(target_os = "redox"))]
         fn main(argc: isize, argv: *const *const c_char, envp: *const *const c_char) -> c_int;
-        #[cfg(target_os = "redox")]
-        fn main(argc: isize, argv: *const *const c_char) -> c_int;
     }
 
     let argc = sp.argc();
@@ -119,6 +116,7 @@ pub unsafe extern "C" fn _start_rust(sp: &'static Stack) -> ! {
     platform::exit(main(
         argc,
         argv as *const *const c_char,
+        platform::environ as *const *const c_char
     ));
 }