:: commit 1ed0767691c26d06b958149224e3f984b8d5dc86

mintsuki <mintsuki@protonmail.com> — 2022-08-09 11:30

parents: fbdd0a0168

build: Drop support for building GCC toolchain

diff --git a/.gitignore b/.gitignore
index 16c809c7..4648c1b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,9 @@
 /libgcc-*
 /bin
 /build
-/toolchain
 /cross-files
 /limine-efi
 /freestanding-headers
-/make_toolchain.sh
 /ovmf*
 *.o
 *.d
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 25d02a85..ecb765f8 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -19,9 +19,6 @@ MKESCAPE = $(subst $(SPACE),\ ,$(1))
 SHESCAPE = $(subst ','\'',$(1))
 NASMESCAPE = $(subst ','"'$(COMMA) \"'\"$(COMMA) '"',$(1))
 
-override PATH := @PATH@
-export PATH
-
 override BUILD_CD_EFI := @BUILD_CD_EFI@
 override BUILD_PXE := @BUILD_PXE@
 override BUILD_CD := @BUILD_CD@
@@ -217,11 +214,11 @@ dist:
 
 .PHONY: distclean
 distclean: clean
-	rm -rf toolchain ovmf* config.log config.status GNUmakefile config.h cross-files
+	rm -rf ovmf* config.log config.status GNUmakefile config.h cross-files
 
 .PHONY: maintainer-clean
 maintainer-clean: distclean
-	cd '$(call SHESCAPE,$(SRCDIR))' && rm -rf freestanding-headers stivale libgcc-binaries make_toolchain.sh limine-efi cross-detect configure build-aux *'~' autom4te.cache *.tar.xz *.tar.gz
+	cd '$(call SHESCAPE,$(SRCDIR))' && rm -rf freestanding-headers stivale libgcc-binaries limine-efi cross-detect configure build-aux *'~' autom4te.cache *.tar.xz *.tar.gz
 
 .PHONY: common-uefi-x86-64
 common-uefi-x86-64:
diff --git a/README.md b/README.md
index 8d198ea0..6061b61f 100644
--- a/README.md
+++ b/README.md
@@ -46,9 +46,9 @@ For example, to clone the latest binary release of the `v3.x` branch one can do
 ```bash
 git clone https://github.com/limine-bootloader/limine.git --branch=v3.0-branch-binary --depth=1
 ```
-or, to clone a specific binary point release (for example `v3.14`)
+or, to clone a specific binary point release (for example `v3.15`)
 ```bash
-git clone https://github.com/limine-bootloader/limine.git --branch=v3.14-binary --depth=1
+git clone https://github.com/limine-bootloader/limine.git --branch=v3.15-binary --depth=1
 ```
 
 In order to rebuild `limine-deploy`, simply run `make` in the binary
@@ -61,30 +61,12 @@ release directory.
 *The following steps are not necessary if cloning a binary release. If so, skip to*
 *"Installing Limine binaries".*
 
-### Building the toolchain
-
-This step can take a long time, but it will ensure that the toolchain will work
-with Limine. If on an x86_64 host, with GCC or Clang installed, it is possible
-that the host toolchain will suffice. You can skip to the next paragraph in order
-to use the system's toolchain instead. If that fails, you can still come back here
-later (remember to `make clean` and re-run `./configure` after building the toolchain).
-
-The toolchain's build process depends on the following packages: `GNU make`,
-`GNU tar`, `texinfo`, `curl`, `gzip`, `bzip2`, `gcc/clang`, `g++/clang++`.
-
-Building the toolchain can be accomplished by running:
-```bash
-TARGET=<target architecture> ./make_toolchain.sh
-```
-where `<target architecture>` is something like `i686` or `x86_64`.
-
 ### Prerequisites
 
 In order to build Limine, the following programs have to be installed:
 `GNU make`, `grep`, `sed`, `find`, `awk`, `gzip`, `nasm`, `mtools`
 (optional, necessary to build `limine-cd-efi.bin`).
-Furthermore, either the toolchain must have been built in the previous
-paragraph, or `gcc` or `llvm/clang` must also be installed, alongside
+Furthermore, `gcc` or `llvm/clang` must also be installed, alongside
 the respective binutils.
 
 ### Configure
diff --git a/bootstrap b/bootstrap
index e833176d..0033b810 100755
--- a/bootstrap
+++ b/bootstrap
@@ -12,7 +12,6 @@ cd "$srcdir"
 [ -d stivale ] || git clone https://github.com/stivale/stivale.git
 [ -d libgcc-binaries ] || git clone https://github.com/mintsuki/libgcc-binaries.git
 [ -d limine-efi ] || git clone https://github.com/limine-bootloader/limine-efi.git
-[ -f make_toolchain.sh ] || ( curl -o make_toolchain.sh https://gist.githubusercontent.com/mintsuki/50fca7022e09f241e40809168662493d/raw/c7eb3dd24100da888893dcee6e8d6b577613b577/make_toolchain.sh && chmod +x make_toolchain.sh )
 
 automake_libdir="$(automake --print-libdir)"
 
diff --git a/configure.ac b/configure.ac
index 2db3c052..71999533 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,12 +7,9 @@ AC_CONFIG_SUBDIRS([cross-detect])
 
 SRCDIR="$(cd "$srcdir" && pwd -P)"
 BUILDDIR="$(pwd -P)"
-PATH="$BUILDDIR/toolchain/bin:$SRCDIR/toolchain/bin:$PATH"
-export PATH
 
 AC_SUBST(SRCDIR, [$SRCDIR])
 AC_SUBST(BUILDDIR, [$BUILDDIR])
-AC_SUBST(PATH, [$PATH])
 
 test "x$CFLAGS" = "x" && CFLAGS='-g -O2 -pipe -Wall -Wextra'
 AC_PROG_CC
tab: 248 wrap: offon