aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Richardson <arichardson@FreeBSD.org>2021-02-17 16:03:11 +0000
committerAlex Richardson <arichardson@FreeBSD.org>2021-02-17 16:35:14 +0000
commit962a3814d4c838d21a67a4b704c64be843cb2b51 (patch)
treef9ec317fafe632f978e4c4ae8dd1f196ae912ff7
parent39df2b568230e02350684e4f4d8353023daa1749 (diff)
downloadsrc-962a3814d4c838d21a67a4b704c64be843cb2b51.tar.gz
src-962a3814d4c838d21a67a4b704c64be843cb2b51.zip
Fix bootstrap tools build on macOS after 02af91c52e71e8a0f47251e637c9687f35d45dd9
After changing the namespace.h header we need to provide _err on macOS, too. Previously we used the system libc err*/warn*, but that does not provide _err/_warn (which is used by other bootstrapped files from libc). To fix this problem bootstrap err.c on macOS as well. Fixes: 02af91c52 (Fix crossbuild bootstrap tools build with Clang 12)
-rw-r--r--tools/build/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/build/Makefile b/tools/build/Makefile
index 48e62e6561b7..effe8b9cb31d 100644
--- a/tools/build/Makefile
+++ b/tools/build/Makefile
@@ -158,6 +158,9 @@ INCS+= ${SRCTOP}/include/getopt.h
# getcap.c is needed for cap_mkdb:
.PATH: ${LIBC_SRCTOP}/gen
SRCS+= getcap.c
+# Glibc does not provide all err*/warn* functions, and for macOS we need the
+# alias with the extra underscore.
+SRCS+= err.c
# Add various libbc functions that are not available in glibc:
SRCS+= stringlist.c setmode.c
SRCS+= strtonum.c merge.c heapsort.c reallocf.c
@@ -172,8 +175,8 @@ SRCS+= strlcpy.c strlcat.c strmode.c
SRCS+= fgetln_fallback.c fgetwln_fallback.c closefrom.c
CFLAGS.closefrom.c+= -DSTDC_HEADERS -DHAVE_SYS_DIR_H -DHAVE_DIRENT_H \
-DHAVE_DIRFD -DHAVE_SYSCONF
-# Provide warnc/errc/getprogname/setprograme
-SRCS+= err.c progname.c
+# Provide getprogname/setprograme
+SRCS+= progname.c
# Stub implementations of fflagstostr/strtofflags
SRCS+= fflags.c
.endif