From 430e841903a3f8471045e68b72154bd943cab91b Mon Sep 17 00:00:00 2001 From: mintsuki Date: Thu, 15 Sep 2022 06:56:32 +0200 Subject: [PATCH] build: Do not request readelf from cross-detect when not needed --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index cc08a87c..e10716aa 100644 --- a/configure.ac +++ b/configure.ac @@ -32,8 +32,8 @@ AC_PROG_INSTALL case "$INSTALL" in .*) INSTALL="$(cd "$(dirname "$INSTALL")" && pwd -P)/$(basename "$INSTALL")" ;; esac -AC_PROG_GREP AC_PROG_SED +AC_PROG_GREP AC_PROG_AWK AC_CHECK_PROG([FIND_FOUND], [find], [yes]) @@ -106,7 +106,7 @@ else ( $MKDIR_P "$BUILDDIR/cross-files" cd "$BUILDDIR/cross-files" - TRIPLET=i686-elf WANT_CROSS_LD=yes WANT_CROSS_OBJCOPY=yes WANT_CROSS_OBJDUMP=yes WANT_CROSS_READELF=yes "$SRCDIR/cross-detect/configure" + TRIPLET=i686-elf WANT_CROSS_LD=yes WANT_CROSS_OBJCOPY=yes WANT_CROSS_OBJDUMP=yes "$SRCDIR/cross-detect/configure" ) || exit 1 BUILD_UEFI_IA32="limine-uefi-ia32" NEED_NASM=yes @@ -126,7 +126,7 @@ else ( $MKDIR_P "$BUILDDIR/cross-files" cd "$BUILDDIR/cross-files" - TRIPLET=x86_64-elf WANT_CROSS_LD=yes WANT_CROSS_OBJCOPY=yes WANT_CROSS_OBJDUMP=yes WANT_CROSS_READELF=yes "$SRCDIR/cross-detect/configure" + TRIPLET=x86_64-elf WANT_CROSS_LD=yes WANT_CROSS_OBJCOPY=yes WANT_CROSS_OBJDUMP=yes "$SRCDIR/cross-detect/configure" ) || exit 1 BUILD_UEFI_X86_64="limine-uefi-x86-64" NEED_NASM=yes @@ -146,7 +146,7 @@ else ( mkdir -p "$BUILDDIR/cross-files" cd "$BUILDDIR/cross-files" - TRIPLET=aarch64-elf WANT_CROSS_LD=yes WANT_CROSS_OBJCOPY=yes WANT_CROSS_OBJDUMP=yes WANT_CROSS_READELF=yes "$SRCDIR/cross-detect/configure" + TRIPLET=aarch64-elf WANT_CROSS_LD=yes WANT_CROSS_OBJCOPY=yes WANT_CROSS_OBJDUMP=yes "$SRCDIR/cross-detect/configure" ) || exit 1 BUILD_UEFI_AARCH64="limine-uefi-aarch64" fi