d0p1/tcc-stupidos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix environ variable for macos.

Browse source
This commit is contained in:
herman ten brugge 2020-06-22 18:10:30 +02:00
parent 039e4ec2a4
commit 3c53d54a43
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tccrun.c
View file

@ -140,6 +140,11 @@ LIBTCCAPI int tcc_run(TCCState *s1, int argc, char **argv)
#ifdef CONFIG_TCC_BACKTRACE #ifdef CONFIG_TCC_BACKTRACE
rt_context *rc = &g_rtctxt; rt_context *rc = &g_rtctxt;
#endif #endif
# if defined(__APPLE__)
char **envp = NULL;
#else
char **envp = environ;
#endif
s1->runtime_main = s1->nostdlib ? "_start" : "main"; s1->runtime_main = s1->nostdlib ? "_start" : "main";
if ((s1->dflag & 16) && !find_c_sym(s1, s1->runtime_main)) if ((s1->dflag & 16) && !find_c_sym(s1, s1->runtime_main))
@ -184,12 +189,12 @@ LIBTCCAPI int tcc_run(TCCState *s1, int argc, char **argv)
fflush(stdout); fflush(stdout);
fflush(stderr); fflush(stderr);
/* These aren't C symbols, so don't need leading underscore handling. */ /* These aren't C symbols, so don't need leading underscore handling. */
run_cdtors(s1, "__init_array_start", "__init_array_end", argc, argv, environ); run_cdtors(s1, "__init_array_start", "__init_array_end", argc, argv, envp);
#ifdef CONFIG_TCC_BACKTRACE #ifdef CONFIG_TCC_BACKTRACE
if (!rc->do_jmp || !(ret = setjmp(rc->jmp_buf))) if (!rc->do_jmp || !(ret = setjmp(rc->jmp_buf)))
#endif #endif
{ {
ret = prog_main(argc, argv, environ); ret = prog_main(argc, argv, envp);
} }
run_cdtors(s1, "__fini_array_start", "__fini_array_end", 0, NULL, NULL); run_cdtors(s1, "__fini_array_start", "__fini_array_end", 0, NULL, NULL);
if ((s1->dflag & 16) && ret) if ((s1->dflag & 16) && ret)