From d521d97b857822f71b3e9eeadab038fd5eab3823 Mon Sep 17 00:00:00 2001 From: Andrew Savchenko Date: Sun, 12 Dec 2021 01:06:18 +0300 Subject: [PATCH 12/12] kernel-cc-ld Pass custom $CC and $LD to kernel during both configure check and build. Otherwise hosts without `gcc` and `ld` wrappers will fail configure. See Gentoo bug 828951. (cherry picked from commit d4676024fe7b2dfac413e6509caccd13f94ac28d) --- src/cf/linux-test1.m4 | 4 ++-- src/libafs/MakefileProto.LINUX.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cf/linux-test1.m4 b/src/cf/linux-test1.m4 index fbe3c1aa80a5..bbab471f4faa 100644 --- a/src/cf/linux-test1.m4 +++ b/src/cf/linux-test1.m4 @@ -25,8 +25,8 @@ $2 MODULE_LICENSE("http://www.openafs.org/dl/license10.html"); MODULE_DESCRIPTION("openafs conftest"); _ACEOF - echo make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir $SPARSE_MAKEFLAGS modules KBUILD_VERBOSE=1 >&AS_MESSAGE_LOG_FD && - make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir $SPARSE_MAKEFLAGS modules KBUILD_VERBOSE=1 >&AS_MESSAGE_LOG_FD 2>conftest.err && + echo make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir $SPARSE_MAKEFLAGS modules KBUILD_VERBOSE=1 CC="${CC}" LD="${LD}" >&AS_MESSAGE_LOG_FD && + make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir $SPARSE_MAKEFLAGS modules KBUILD_VERBOSE=1 CC="${CC}" LD="${LD}" >&AS_MESSAGE_LOG_FD 2>conftest.err && ! grep -i "WARNING: .* undefined!$" conftest.err >/dev/null 2>&1 then [$3] else diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in index 2509944e9aed..0306df35e593 100644 --- a/src/libafs/MakefileProto.LINUX.in +++ b/src/libafs/MakefileProto.LINUX.in @@ -324,7 +324,7 @@ ${LIBAFS} ${LIBAFS_MP} ${LIBAFS_EP} ${LIBAFS_BM}: ${LINUX_LIBAFS_NAME}.ko ${LINUX_LIBAFS_NAME}.ko afspag.ko: .FORCE env EXTRA_CFLAGS="${EXTRA_CFLAGS}" @TOP_SRCDIR@/libafs/make_kbuild_makefile.pl ${KDIR} $@ @TOP_OBJDIR@/src/config/Makefile.config Makefile.afs Makefile.common ( env EXTRA_CFLAGS="${EXTRA_CFLAGS}" \ - $(MAKE) -C ${LINUX_KERNEL_BUILD} M=@TOP_OBJDIR@/src/libafs/${KDIR} $(SPARSE_MAKEFLAGS) modules 2>&1 \ + $(MAKE) -C ${LINUX_KERNEL_BUILD} M=@TOP_OBJDIR@/src/libafs/${KDIR} $(SPARSE_MAKEFLAGS) CC="${CC}" LD="${LD}" modules 2>&1 \ || echo "FAILURE: make exit code $$?" ) | tee .makelog @if grep -E -q '^(FAILURE|WARNING)' .makelog; then \ grep -q '^WARNING' .makelog && echo "Error: Undefined symbols in modules" ; \ -- 2.52.0