From 973d4a5da7171c166358ae74a74505320fb50ba6 Mon Sep 17 00:00:00 2001
From: nakst <>
Date: Thu, 20 Jan 2022 11:05:37 +0000
Subject: [PATCH] don't build new compiler toolchain by default

---
 help/Building.md                 | 2 +-
 util/automation/build_minimal.sh | 2 --
 util/build.c                     | 8 ++++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/help/Building.md b/help/Building.md
index 062beb5..eacd077 100644
--- a/help/Building.md
+++ b/help/Building.md
@@ -14,7 +14,7 @@ Start the build system.
 
     ./start.sh
 
-Follow the on-screen instructions to build a cross compiler.
+The compiler toolchain will be downloaded.
 
 Once complete, you can test the operating system in an emulator. 
 * If you have Qemu and KVM installed, run `k` in the build system. **Recommended!**
diff --git a/util/automation/build_minimal.sh b/util/automation/build_minimal.sh
index e095242..2629197 100755
--- a/util/automation/build_minimal.sh
+++ b/util/automation/build_minimal.sh
@@ -15,6 +15,4 @@ echo "Dependency.stb_image=0"           >> bin/config.ini
 echo "Dependency.stb_image_write=0"     >> bin/config.ini
 echo "Dependency.stb_sprintf=0"         >> bin/config.ini
 echo "Dependency.FreeTypeAndHarfBuzz=0" >> bin/config.ini
-./start.sh get-source prefix https://github.com/nakst/build-gcc/releases/download/gcc-11.1.0/gcc-x86_64-essence.tar.xz
-./start.sh setup-pre-built-toolchain
 ./start.sh build-optimised
diff --git a/util/build.c b/util/build.c
index e8184b5..ac98239 100644
--- a/util/build.c
+++ b/util/build.c
@@ -1966,7 +1966,15 @@ int main(int _argc, char **_argv) {
 	const char *runFirstCommand = NULL;
 
 	if (CallSystem("" TOOLCHAIN_PREFIX "-gcc --version > /dev/null 2>&1 ")) {
+#if 0
 		BuildCrossCompiler();
+#else
+		fprintf(stderr, "Downloading the compiler toolchain...\n");
+		DoCommand("get-source-checked 700205f81c7a5ca3279ae7b1fdb24e025d33b36a9716b81a71125bf0fec0de50 "
+				"prefix https://github.com/nakst/build-gcc/releases/download/gcc-11.1.0/gcc-x86_64-essence.tar.xz");
+		DoCommand("setup-pre-built-toolchain");
+		AddCompilerToPath();
+#endif
 		runFirstCommand = "b";
 		foundValidCrossCompiler = true;
 	}