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

build: Minor portability fixes

Browse Source
This commit is contained in:
mintsuki 2022-02-03 11:35:54 +01:00
parent 400202d926
commit 7d70e31258
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
GNUmakefile.in
View File

@ -16,12 +16,6 @@ NASMESCAPE = $(subst ','"'$(COMMA) \"'\"$(COMMA) '"',$(1))
override PATH := $(BUILDDIR)/toolchain/bin:/usr/local/bin:$(PATH) override PATH := $(BUILDDIR)/toolchain/bin:/usr/local/bin:$(PATH)
export PATH export PATH
override LIMINE_VERSION := @limine_version@
export LIMINE_VERSION
override LIMINE_COPYRIGHT := $(shell grep Copyright '$(call SHESCAPE,$(SRCDIR))/LICENSE.md')
export LIMINE_COPYRIGHT
WERROR ?= @werror@ WERROR ?= @werror@
export WERROR export WERROR
@ -73,6 +67,12 @@ export LIMINE_READELF
override USING_CLANG := @using_clang@ override USING_CLANG := @using_clang@
export USING_CLANG export USING_CLANG
override LIMINE_VERSION := @limine_version@
export LIMINE_VERSION
override LIMINE_COPYRIGHT := $(shell $(GREP) Copyright '$(call SHESCAPE,$(SRCDIR))/LICENSE.md')
export LIMINE_COPYRIGHT
override STAGE1_FILES := $(shell find '$(call SHESCAPE,$(SRCDIR))/stage1' -type f -name '*.asm') override STAGE1_FILES := $(shell find '$(call SHESCAPE,$(SRCDIR))/stage1' -type f -name '*.asm')
.PHONY: all .PHONY: all

12
configure.ac
View File

@ -79,9 +79,9 @@ if ! $LIMINE_CC --version >/dev/null 2>&1; then
CC_ERROR_MSG CC_ERROR_MSG
fi fi
if $LIMINE_CC --version | grep clang >/dev/null 2>&1; then if $LIMINE_CC --version | $GREP clang >/dev/null 2>&1; then
AC_SUBST(using_clang, 1) AC_SUBST(using_clang, 1)
elif $LIMINE_CC --version | grep 'Free Software Foundation' >/dev/null 2>&1; then elif $LIMINE_CC --version | $GREP 'Free Software Foundation' >/dev/null 2>&1; then
AC_SUBST(using_clang, 0) AC_SUBST(using_clang, 0)
else else
CC_ERROR_MSG CC_ERROR_MSG
@ -103,19 +103,19 @@ AC_DEFUN([GET_BINUTILS_PROG], [
if ! test "x$LIMINE_$1" = "x"; then if ! test "x$LIMINE_$1" = "x"; then
AC_CHECK_PROG([LIMINE_$1_0], [$LIMINE_$1], [yes]) 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" || ! $LIMINE_$1 --version | $GREP 'Free Software Foundation' >/dev/null 2>&1; then
AC_MSG_ERROR([LIMINE_$1 ($LIMINE_$1) is not a suitable $3]) AC_MSG_ERROR([LIMINE_$1 ($LIMINE_$1) is not a suitable $3])
fi fi
else else
LIMINE_$1="$TOOLCHAIN-$2" LIMINE_$1="$TOOLCHAIN-$2"
AC_CHECK_PROG([LIMINE_$1_1], [$LIMINE_$1], [yes]) 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" || ! $LIMINE_$1 --version | $GREP 'Free Software Foundation' >/dev/null 2>&1; then
LIMINE_$1='g$2' LIMINE_$1='g$2'
AC_CHECK_PROG([LIMINE_$1_2], [$LIMINE_$1], [yes]) 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" || ! $LIMINE_$1 --version | $GREP 'Free Software Foundation' >/dev/null 2>&1; then
LIMINE_$1='$2' LIMINE_$1='$2'
AC_CHECK_PROG([LIMINE_$1_3], [$LIMINE_$1], [yes]) 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 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]) AC_MSG_ERROR([no suitable LIMINE_$1 found, run $srcdir/make_toolchain.sh or install GNU binutils])
fi fi
fi fi