646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
12 lines
491 B
Diff
12 lines
491 B
Diff
--- a/lib/libc/Makefile
|
|
+++ b/lib/libc/Makefile
|
|
@@ -194,7 +194,7 @@ SUBDIR.${MK_TESTS}+= tests
|
|
# recording a build dependency
|
|
CFLAGS+= -I${SRCTOP}/lib/libutil
|
|
# Same issue with libm
|
|
-MSUN_ARCH_SUBDIR != ${MAKE} -B -C ${SRCTOP}/lib/msun -V ARCH_SUBDIR
|
|
+MSUN_ARCH_SUBDIR = ${MACHINE_CPUARCH:S/i386/i387/}
|
|
# unfortunately msun/src contains both private and public headers
|
|
CFLAGS+= -I${SRCTOP}/lib/msun/${MSUN_ARCH_SUBDIR}
|
|
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
|