From b45fd24a3ca666fbb1c754d9de94a9b33fa7949e Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Mon, 7 Sep 2026 02:23:45 +0300 Subject: [PATCH] lib/msun: move the calculation of LIBC_SRCTOP earlier which makes the variable available for machine/Makefile.inc usage. Reviewed by: fuz, kfv Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D59462 --- lib/msun/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/msun/Makefile b/lib/msun/Makefile index 6505d09cdaa5..8fa47d752123 100644 --- a/lib/msun/Makefile +++ b/lib/msun/Makefile @@ -10,6 +10,11 @@ # PACKAGE= clibs + +# LIBCSRCDIR is defined lazily, so can't be used for exists() below +LIBC_SRCTOP=${SRCTOP}/lib/libc +# Location of fpmath.h and _fpmath.h + ARCH_SUBDIR= ${MACHINE_CPUARCH:S/i386/i387/} .include "${ARCH_SUBDIR}/Makefile.inc" @@ -100,10 +105,6 @@ COMMON_SRCS= b_tgamma.c \ COMMON_SRCS+= s_asinpi.c s_asinpif.c s_atanpi.c s_atanpif.c \ s_cospi.c s_cospif.c s_sinpi.c s_sinpif.c s_tanpi.c s_tanpif.c -# LIBCSRCDIR is defined lazily, so can't be used for exists() below -LIBC_SRCTOP=${SRCTOP}/lib/libc -# Location of fpmath.h and _fpmath.h - # Pick the current architecture directory for libc. In general, this is named # MACHINE_CPUARCH, but some ABIs are different enough to require their own libc, # so allow a directory named MACHINE_ARCH to override this (though treat