berkus
/
essence-os
mirror of https://gitlab.com/nakst/essence
1
0
Fork 0
Code Releases Activity

Add full PATH to build_core execution environment to avoid gcc error on MSYS(Windows). Fix missing comma.

This commit is contained in:
Martin Lisowski 2025-01-07 15:38:29 +01:00
parent e81347a68b
commit 1104a2f2ef
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
util/build_core.c
View File

@ -1337,9 +1337,18 @@ int main(int argc, char **argv) {
if (0 == strcmp(s.section, "toolchain")) {
if (0 == strcmp(s.key, "path")) {
#ifndef __MSYS__
executeEnvironment[0] = (char *) malloc(5 + s.valueBytes + 1);
#else
executeEnvironment[0] = (char *) malloc(5 + s.valueBytes + 1 + strlen(getenv("PATH")) + 1);
#endif
strcpy(executeEnvironment[0], "PATH=");
strcat(executeEnvironment[0], s.value);
#ifdef __MSYS__
// append current PATH to INI PATH otherwise we will get gcc error "error while loading shared libraries: ?: cannot open shared object file: No such file or directory"
strcat(executeEnvironment[0], ":");
strcat(executeEnvironment[0], getenv("PATH"));
#endif
} else if (0 == strcmp(s.key, "tmpdir")) {
if (s.value[0]) {
executeEnvironment[1] = (char *) malloc(7 + s.valueBytes + 1);
@ -1579,7 +1588,7 @@ int main(int argc, char **argv) {
CopyFile(buffer, "bin/Object Files/crtend.o", false);
Execute(toolchainCC, "-c", "desktop/crt1.c", "-o", "bin/Object Files/crt1.o", ArgString(cCompileFlags), ArgString(commonCompileFlags));
Execute(toolchainCC, "-c", "desktop/crtglue.c", "-o" "bin/Object Files/crtglue.o", ArgString(cCompileFlags), ArgString(commonCompileFlags));
Execute(toolchainCC, "-c", "desktop/crtglue.c", "-o", "bin/Object Files/crtglue.o", ArgString(cCompileFlags), ArgString(commonCompileFlags));
CopyFile("bin/Object Files/crti.o", "root/Applications/POSIX/lib/crti.o", false);
CopyFile("bin/Object Files/crtbegin.o", "root/Applications/POSIX/lib/crtbegin.o", false);
CopyFile("bin/Object Files/crtend.o", "root/Applications/POSIX/lib/crtend.o", false);