From: Andreas K. Hüttel <dilfridge@gentoo.org>
Date: Mon, 21 Jul 2025 21:48:43 +0000 (+0200)
Subject: Makeconfig: The hash character # confuses old make, use $(dir instead of sed
X-Git-Tag: glibc-2.42~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1944817240eeea5c044995e45a771a5a5193ecf1;p=thirdparty%2Fglibc.git

Makeconfig: The hash character # confuses old make, use $(dir instead of sed

Up to Make 4.2, # is treated as the start of a comment even in
function invocations. This leads to a syntax error. Fixed in Make 4.3,
but we still support versions back to 4.0 at the moment.

Tested on Gentoo (x86-64) and Debian (loongarch64)

Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
Reviewed-by: Collin Funk <collin.funk1@gmail.com>
---

diff --git a/Makeconfig b/Makeconfig
index e29a2db058..7102d922b2 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -718,7 +718,7 @@ libgcc_eh := -Wl,--as-needed -lgcc_s $(libunwind) -Wl,--no-as-needed
 gnulib-arch =
 gnulib = -lgcc $(gnulib-arch)
 gnulib-tests := -lgcc $(libgcc_eh)
-gnulib-extralibdir = $(shell $(CC) -print-file-name=libgcc_s.so$(libgcc_s.so-version) | sed 's#/[^/]*$$##')
+gnulib-extralibdir = $(dir $(shell $(CC) -print-file-name=libgcc_s.so$(libgcc_s.so-version)))
 static-gnulib-arch =
 # By default, elf/static-stubs.o, instead of -lgcc_eh, is used to
 # statically link programs.  When --disable-shared is used, we use