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

build: No longer hard depend on GNU binutils

Browse Source
This commit is contained in:
mintsuki 2022-04-20 04:38:58 +02:00
parent df7e43df7f
commit 64e9c11daa
3 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -88,7 +88,7 @@ In order to build Limine, the following programs have to be installed:
(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
`GNU binutils`. `nasm` is optional if the toolchain was built in the previous
the respective binutils. `nasm` is optional if the toolchain was built in the previous
paragraph as it is built as part of it.
### Configure
@ -101,6 +101,8 @@ If checking out from the repository, run `./autogen.sh` first (`GNU autoconf` an
Both `./autogen.sh` and `./configure` take arguments and environment variables;
for more information on these, run `./configure --help`.
To build using the LLVM toolchain, pass `TOOLCHAIN=llvm` to `./configure`.
Limine supports both in-tree and out-of-tree builds. Simply run the `configure`
script from the directory you wish to execute the build in. The following `make`
commands are supposed to be ran inside the build directory.

4
common/linker_uefi64.ld.in
View File

@ -89,6 +89,10 @@ SECTIONS
*(.shstrtab)
} :null
/DISCARD/ : {
*.32.o(.debug*)
}
.debug_aranges 0 : {
*(.debug_aranges)
} :null

30
configure.ac
View File

@ -160,7 +160,11 @@ if ! test "x$LIMINE_CC" = "x"; then
AC_MSG_ERROR([LIMINE_CC ($LIMINE_CC) not found])
fi
else
LIMINE_CC="$TOOLCHAIN-gcc"
if test "$TOOLCHAIN" = 'llvm'; then
LIMINE_CC='clang'
else
LIMINE_CC="$TOOLCHAIN-gcc"
fi
AC_CHECK_PROG([LIMINE_CC_1], [$LIMINE_CC], [yes])
if ! test "x$LIMINE_CC_1" = "xyes"; then
LIMINE_CC="$CC"
@ -199,20 +203,32 @@ AC_DEFUN([GET_BINUTILS_PROG], [
if ! test "x$LIMINE_$1" = "x"; then
AC_CHECK_PROG([LIMINE_$1_0], [$LIMINE_$1], [yes])
if ! test "x$LIMINE_$1_0" = "xyes" || ! $LIMINE_$1 --version | $GREP 'Free Software Foundation' >/dev/null 2>&1; then
if ! test "x$LIMINE_$1_0" = "xyes"; then
AC_MSG_ERROR([LIMINE_$1 ($LIMINE_$1) is not a suitable $3])
fi
else
LIMINE_$1="$TOOLCHAIN-$2"
if test "$TOOLCHAIN" = 'llvm' && test '$2' = 'ld'; then
LIMINE_$1='ld.lld'
else
LIMINE_$1="$TOOLCHAIN-$2"
fi
AC_CHECK_PROG([LIMINE_$1_1], [$LIMINE_$1], [yes])
if ! test "x$LIMINE_$1_1" = "xyes" || ! $LIMINE_$1 --version | $GREP 'Free Software Foundation' >/dev/null 2>&1; then
if ! test "x$LIMINE_$1_1" = "xyes"; then
LIMINE_$1='g$2'
AC_CHECK_PROG([LIMINE_$1_2], [$LIMINE_$1], [yes])
if ! test "x$LIMINE_$1_2" = "xyes" || ! $LIMINE_$1 --version | $GREP 'Free Software Foundation' >/dev/null 2>&1; then
if ! test "x$LIMINE_$1_2" = "xyes"; then
LIMINE_$1='$2'
AC_CHECK_PROG([LIMINE_$1_3], [$LIMINE_$1], [yes])
if ! test "x$LIMINE_$1_3" = "xyes" || ! $LIMINE_$1 --version | $GREP 'Free Software Foundation' >/dev/null 2>&1; then
AC_MSG_ERROR([no suitable LIMINE_$1 found, run $srcdir/make_toolchain.sh or install GNU binutils])
if ! test "x$LIMINE_$1_3" = "xyes"; then
if test '$2' = 'ld'; then
LIMINE_$1='ld.lld'
else
LIMINE_$1='llvm-$2'
fi
AC_CHECK_PROG([LIMINE_$1_4], [$LIMINE_$1], [yes])
if ! test "x$LIMINE_$1_4" = "xyes"; then
AC_MSG_ERROR([no suitable LIMINE_$1 found, run $srcdir/make_toolchain.sh or install LLVM/GNU binutils])
fi
fi
fi
fi