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

extract sysroot for pre built toolchain 2

This commit is contained in:
nakst 2021-12-25 11:05:25 +00:00
parent a8e26c63b8
commit 2c2f767c05
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/build.c
View File

@ -1591,7 +1591,7 @@ void DoCommand(const char *l) {
CallSystem("mv bin/source cross"); CallSystem("mv bin/source cross");
CallSystem("mkdir -p cross/bin2"); CallSystem("mkdir -p cross/bin2");
CallSystem("gcc -o bin/change_sysroot util/change_sysroot.c -Wall -Wextra"); CallSystem("gcc -o bin/change_sysroot util/change_sysroot.c -Wall -Wextra");
CallSystem("cross/bin2/" TOOLCHAIN_PREFIX "-gcc --verbose > bin/temp.txt"); CallSystem("cross/bin/" TOOLCHAIN_PREFIX "-gcc --verbose 2> bin/temp.txt");
char *configureFlags = (char *) LoadFile("bin/temp.txt", NULL); char *configureFlags = (char *) LoadFile("bin/temp.txt", NULL);
char *sysrootPath = strstr(configureFlags, "--with-sysroot="); char *sysrootPath = strstr(configureFlags, "--with-sysroot=");
sysrootPath += 15; sysrootPath += 15;
@ -1599,7 +1599,7 @@ void DoCommand(const char *l) {
if (sysrootPathEnd) *sysrootPathEnd = 0; if (sysrootPathEnd) *sysrootPathEnd = 0;
free(configureFlags); free(configureFlags);
CallSystem("rm bin/temp.txt"); CallSystem("rm bin/temp.txt");
fprintf("Detected sysroot from gcc as \"%s\".\n", sysrootPath); fprintf(stderr, "Detected sysroot from gcc as \"%s\".\n", sysrootPath);
#define MAKE_TOOLCHAIN_WRAPPER(tool) \ #define MAKE_TOOLCHAIN_WRAPPER(tool) \
CallSystemF("gcc -o cross/bin2/" TOOLCHAIN_PREFIX "-" tool \ CallSystemF("gcc -o cross/bin2/" TOOLCHAIN_PREFIX "-" tool \
" util/toolchain_wrapper.c -Wall -Wextra -g " \ " util/toolchain_wrapper.c -Wall -Wextra -g " \

2
util/toolchain_wrapper.c
View File

@ -28,7 +28,7 @@ int main(int argc, char **argv) {
// printf("'%s'\n", tool); // printf("'%s'\n", tool);
char **newArgv = (char **) calloc(sizeof(char *), (argc + 4)); char **newArgv = (char **) calloc(sizeof(char *), (argc + 4));
newArgv[0] = change; newArgv[0] = change;
newArgv[1] = CONFIGURE_SYSROOT; newArgv[1] = STRING(CONFIGURE_SYSROOT);
newArgv[2] = sysroot; newArgv[2] = sysroot;
newArgv[3] = tool; newArgv[3] = tool;
memcpy(newArgv + 4, argv + 1, (argc - 1) * sizeof(char *)); memcpy(newArgv + 4, argv + 1, (argc - 1) * sizeof(char *));