diff options
| author | nia <nia@pkgsrc.org> | 2020-01-24 12:36:28 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2020-01-24 12:36:28 +0000 |
| commit | 19a4a46975f59f9419510cb5b54f930f69a9e953 (patch) | |
| tree | 9418f6a3ac0b98eadd303e700bbcd7a791452df4 | |
| parent | f5c5a4131338cb80ffce2783f22f77430eb23349 (diff) | |
| download | pkgsrc-19a4a46975f59f9419510cb5b54f930f69a9e953.tar.gz | |
mk/platform/Linux.mk: Use _OPSYS_LIB_DIRS to find glibc paths.
This seems more correct as it handles Debian/others already.
| -rw-r--r-- | mk/platform/Linux.mk | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk index 068c92fe4ff..3c7a2be8807 100644 --- a/mk/platform/Linux.mk +++ b/mk/platform/Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: Linux.mk,v 1.81 2020/01/24 12:32:21 nia Exp $ +# $NetBSD: Linux.mk,v 1.82 2020/01/24 12:36:28 nia Exp $ # # Variable definitions for the Linux operating system. @@ -167,13 +167,10 @@ _WRAP_EXTRA_ARGS.LD+= -m elf_i386 CWRAPPERS_APPEND.ld+= -m elf_i386 .endif -_GLIBC_PATHS+= /lib${LIBABISUFFIX}/libc.so.6 -_GLIBC_PATHS+= /lib/${MACHINE_ARCH}-linux-gnu/libc.so.6 - -.for _glibc_path in ${_GLIBC_PATHS} -. if exists(${_glibc_path}) +.for _glibc_path in ${_OPSYS_LIB_DIRS} +. if exists(${_glibc_path}/libc.so.6) ## Use _CMD so the command only gets run when needed! -_GLIBC_VERSION_CMD= ${_glibc_path} --version | \ +_GLIBC_VERSION_CMD= ${_glibc_path}/libc.so.6 --version | \ sed -ne's/^GNU C.*version \(.*\),.*$$/\1/p' GLIBC_VERSION= ${_GLIBC_VERSION_CMD:sh} . endif |