Aren
/
rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

toolchain: Use program prefix limine- to avoid collisions with x86_64-elf system toolchains

This commit is contained in:
mintsuki 2021-08-06 05:05:50 +02:00
parent 0dde09bbb9
commit 6275457af0
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -5,7 +5,7 @@ PATH := $(shell pwd)/toolchain/bin:$(PATH)
NCPUS := $(shell nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 1) NCPUS := $(shell nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 1)
TOOLCHAIN = x86_64-elf TOOLCHAIN = limine
TOOLCHAIN_CC = $(TOOLCHAIN)-gcc TOOLCHAIN_CC = $(TOOLCHAIN)-gcc

4
README.md
View File

@ -101,8 +101,8 @@ make # (or gmake where applicable)
It is possible to pass `make` additional flags, most relevantly, It is possible to pass `make` additional flags, most relevantly,
`TOOLCHAIN=`, which allows one to specify an alternative toolchain for the build `TOOLCHAIN=`, which allows one to specify an alternative toolchain for the build
system to use (the default is `x86_64-elf`, falling back to no-triple, or host, system to use (the default is `limine`, resulting in program names like `limine-gcc`,
toolchain). falling back to no-prefix, or host, toolchain).
The generated bootloader files are going to be in `bin`. The generated bootloader files are going to be in `bin`.

4
aux/make_toolchain.sh
View File

@ -38,7 +38,7 @@ tar -zxf ../gcc-$GCCVERSION.tar.gz
mkdir build-binutils mkdir build-binutils
cd build-binutils cd build-binutils
../binutils-$BINUTILSVERSION/configure CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" --target=$TARGET --prefix="$PREFIX" --with-sysroot --disable-nls --disable-werror --enable-targets=x86_64-elf,x86_64-pe ../binutils-$BINUTILSVERSION/configure CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" --target=$TARGET --prefix="$PREFIX" --program-prefix=limine- --with-sysroot --disable-nls --disable-werror --enable-targets=x86_64-elf,x86_64-pe
$MAKE $MAKE
$MAKE install $MAKE install
cd .. cd ..
@ -48,7 +48,7 @@ contrib/download_prerequisites
cd .. cd ..
mkdir build-gcc mkdir build-gcc
cd build-gcc cd build-gcc
../gcc-$GCCVERSION/configure CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" --target=$TARGET --prefix="$PREFIX" --disable-nls --enable-languages=c --without-headers ../gcc-$GCCVERSION/configure CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" --target=$TARGET --prefix="$PREFIX" --program-prefix=limine- --disable-nls --enable-languages=c --without-headers
$MAKE all-gcc $MAKE all-gcc
$MAKE all-target-libgcc $MAKE all-target-libgcc
$MAKE install-gcc $MAKE install-gcc

2
decompressor/Makefile
View File

@ -4,7 +4,7 @@ ifeq ($(BUILDDIR), )
$(error BUILDDIR not specified) $(error BUILDDIR not specified)
endif endif
TOOLCHAIN = x86_64-elf TOOLCHAIN = limine
TOOLCHAIN_CC = $(TOOLCHAIN)-gcc TOOLCHAIN_CC = $(TOOLCHAIN)-gcc
TOOLCHAIN_LD = $(TOOLCHAIN)-ld TOOLCHAIN_LD = $(TOOLCHAIN)-ld

2
stage23/Makefile
View File

@ -15,7 +15,7 @@ else
$(error Invalid target) $(error Invalid target)
endif endif
TOOLCHAIN = x86_64-elf TOOLCHAIN = limine
TOOLCHAIN_CC = $(TOOLCHAIN)-gcc TOOLCHAIN_CC = $(TOOLCHAIN)-gcc
TOOLCHAIN_LD = $(TOOLCHAIN)-ld TOOLCHAIN_LD = $(TOOLCHAIN)-ld