From 2c2f767c05837f508b7216eba382fe30982682a7 Mon Sep 17 00:00:00 2001
From: nakst <>
Date: Sat, 25 Dec 2021 11:05:25 +0000
Subject: [PATCH] extract sysroot for pre built toolchain 2

---
 util/build.c             | 4 ++--
 util/toolchain_wrapper.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/util/build.c b/util/build.c
index 5f8a59d..c97f58b 100644
--- a/util/build.c
+++ b/util/build.c
@@ -1591,7 +1591,7 @@ void DoCommand(const char *l) {
 		CallSystem("mv bin/source cross");
 		CallSystem("mkdir -p cross/bin2");
 		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 *sysrootPath = strstr(configureFlags, "--with-sysroot=");
 		sysrootPath += 15;
@@ -1599,7 +1599,7 @@ void DoCommand(const char *l) {
 		if (sysrootPathEnd) *sysrootPathEnd = 0;
 		free(configureFlags);
 		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) \
 		CallSystemF("gcc -o cross/bin2/" TOOLCHAIN_PREFIX "-" tool \
 				" util/toolchain_wrapper.c -Wall -Wextra -g " \
diff --git a/util/toolchain_wrapper.c b/util/toolchain_wrapper.c
index 2a1ea75..151168c 100644
--- a/util/toolchain_wrapper.c
+++ b/util/toolchain_wrapper.c
@@ -28,7 +28,7 @@ int main(int argc, char **argv) {
 	// printf("'%s'\n", tool);
 	char **newArgv = (char **) calloc(sizeof(char *), (argc + 4));
 	newArgv[0] = change;
-	newArgv[1] = CONFIGURE_SYSROOT;
+	newArgv[1] = STRING(CONFIGURE_SYSROOT);
 	newArgv[2] = sysroot;
 	newArgv[3] = tool;
 	memcpy(newArgv + 4, argv + 1, (argc - 1) * sizeof(char *));