diff --git a/libtcc.c b/libtcc.c index 34b6daf..bcef2a6 100644 --- a/libtcc.c +++ b/libtcc.c @@ -1348,8 +1348,8 @@ LIBTCCAPI int tcc_set_output_type(TCCState *s, int output_type) if ((output_type == TCC_OUTPUT_EXE || output_type == TCC_OUTPUT_DLL) && !s->nostdlib) { if (output_type != TCC_OUTPUT_DLL) - tcc_add_file(s, CONFIG_TCC_CRT_PREFIX "/crt1.o"); - tcc_add_file(s, CONFIG_TCC_CRT_PREFIX "/crti.o"); + tcc_add_file(s, CONFIG_SYSROOT CONFIG_TCC_CRT_PREFIX "/crt1.o"); + tcc_add_file(s, CONFIG_SYSROOT CONFIG_TCC_CRT_PREFIX "/crti.o"); } #endif return 0; diff --git a/tcc.h b/tcc.h index 636822b..f8ad00c 100644 --- a/tcc.h +++ b/tcc.h @@ -149,7 +149,7 @@ typedef int BOOL; /* path to find crt1.o, crti.o and crtn.o */ #ifndef CONFIG_TCC_CRT_PREFIX -# define CONFIG_TCC_CRT_PREFIX CONFIG_SYSROOT "/usr" CONFIG_TCC_LDDIR +# define CONFIG_TCC_CRT_PREFIX "/usr" CONFIG_TCC_LDDIR #endif #ifndef CONFIG_TCC_SYSINCLUDE_PATHS @@ -165,7 +165,7 @@ typedef int BOOL; # define CONFIG_TCC_LIBPATH "\b/lib" # else # define CONFIG_TCC_LIBPATH \ - CONFIG_TCC_CRT_PREFIX \ + CONFIG_SYSROOT CONFIG_TCC_CRT_PREFIX \ ":" CONFIG_SYSROOT CONFIG_TCC_LDDIR \ ":" CONFIG_SYSROOT "/usr/local" CONFIG_TCC_LDDIR # endif diff --git a/tccelf.c b/tccelf.c index 3ac71cb..c0f1c94 100644 --- a/tccelf.c +++ b/tccelf.c @@ -1252,7 +1252,7 @@ ST_FUNC void tcc_add_runtime(TCCState *s1) } /* add crt end if not memory output */ if (s1->output_type != TCC_OUTPUT_MEMORY && !s1->nostdlib) { - tcc_add_file(s1, CONFIG_TCC_CRT_PREFIX "/crtn.o"); + tcc_add_file(s1, CONFIG_SYSROOT CONFIG_TCC_CRT_PREFIX "/crtn.o"); } }