diff --git a/Makefile.inc1 b/Makefile.inc1 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2332,6 +2332,11 @@ ${_bt}-usr.bin/localedef: ${_bt}-usr.bin/yacc ${_bt_lex_depend} .endif +.if ${MK_ICONV} != "no" +_mkesdb= usr.bin/mkesdb +_mkcsmapper= usr.bin/mkcsmapper +.endif + .if ${MK_KERBEROS} != "no" _kerberos5_bootstrap_tools= \ kerberos5/tools/make-roken \ @@ -2485,6 +2490,8 @@ ${_nmtree} \ ${_vtfontcvt} \ ${_localedef} \ + ${_mkcsmapper} \ + ${_mkesdb} \ ${LOCAL_BSTOOL_DIRS} ${_bt}-${_tool}: ${_bt}-links .PHONY .MAKE ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ @@ -2551,8 +2558,6 @@ ${_share} \ usr.bin/awk \ ${_libmagic} \ - usr.bin/mkesdb_static \ - usr.bin/mkcsmapper_static \ usr.bin/vi/catalog build-tools_${_tool}: .PHONY ${_+_}@${ECHODIR} "===> ${_tool} (${_bt_clean:D${_bt_clean},}obj,build-tools)"; \ diff --git a/share/i18n/csmapper/Makefile.inc b/share/i18n/csmapper/Makefile.inc --- a/share/i18n/csmapper/Makefile.inc +++ b/share/i18n/csmapper/Makefile.inc @@ -3,7 +3,5 @@ .include CSMAPPERDIR?= /usr/share/i18n/csmapper -.if ${MK_STAGING} == "yes" -MKCSMAPPER= ${STAGE_HOST_OBJTOP}/usr/bin/mkcsmapper_static -.endif -MKCSMAPPER?= ${.OBJDIR:H:H:H}/usr.bin/mkcsmapper_static/mkcsmapper_static +# mkcsmapper should have been built as part of bootstrap-tools +MKCSMAPPER?= ${.OBJDIR:H:H:H:H}/tmp/legacy/usr/bin/mkcsmapper diff --git a/share/i18n/csmapper/Makefile.part b/share/i18n/csmapper/Makefile.part --- a/share/i18n/csmapper/Makefile.part +++ b/share/i18n/csmapper/Makefile.part @@ -1,8 +1,6 @@ # $FreeBSD$ # $NetBSD: Makefile,v 1.13 2007/03/13 16:34:37 tnozaki Exp $ -MKCSMAPPER?= ${.OBJDIR:H:H:H:H}/usr.bin/mkcsmapper_static/mkcsmapper_static - ESUBDIR?= ${CODE} PARTFILE?= ${.CURDIR}/${CODE}.part .if exists(${PARTFILE}) diff --git a/share/i18n/esdb/Makefile.inc b/share/i18n/esdb/Makefile.inc --- a/share/i18n/esdb/Makefile.inc +++ b/share/i18n/esdb/Makefile.inc @@ -5,7 +5,5 @@ .PATH: ${.CURDIR} ESDBDIR?= /usr/share/i18n/esdb -.if ${MK_STAGING} == "yes" -MKESDB= ${STAGE_HOST_OBJTOP}/usr/bin/mkesdb_static -.endif -MKESDB?= ${.OBJDIR:H:H:H}/usr.bin/mkesdb_static/mkesdb_static +# mkesdb should have been built as part of bootstrap-tools +MKESDB?= ${.OBJDIR:H:H:H:H}/tmp/legacy/usr/bin/mkesdb diff --git a/share/i18n/esdb/Makefile.part b/share/i18n/esdb/Makefile.part --- a/share/i18n/esdb/Makefile.part +++ b/share/i18n/esdb/Makefile.part @@ -1,8 +1,6 @@ # $FreeBSD$ # $NetBSD: Makefile.part,v 1.6 2008/10/25 22:35:36 apb Exp $ -MKESDB?= ${.OBJDIR:H:H:H:H}/usr.bin/mkesdb_static/mkesdb_static - PARTFILE?= ${.CURDIR}/${CODE}.part ALIASFILE?= ${.CURDIR}/${CODE}.alias .if !defined(NO_SEP) diff --git a/targets/pseudo/hosttools/Makefile.depend.host b/targets/pseudo/hosttools/Makefile.depend.host --- a/targets/pseudo/hosttools/Makefile.depend.host +++ b/targets/pseudo/hosttools/Makefile.depend.host @@ -12,8 +12,8 @@ usr.bin/clang/clang-tblgen \ usr.bin/clang/llvm-tblgen \ usr.bin/localedef \ - usr.bin/mkcsmapper_static \ - usr.bin/mkesdb_static \ + usr.bin/mkcsmapper \ + usr.bin/mkesdb \ usr.bin/xinstall \ usr.bin/yacc \ usr.sbin/config \ diff --git a/usr.bin/Makefile b/usr.bin/Makefile --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -289,12 +289,6 @@ SUBDIR.${MK_SVNLITE}+= svn SUBDIR.${MK_OFED}+= ofed -# These are normally only handled for build-tools. -.if make(clean*) -SUBDIR+= mkcsmapper_static -SUBDIR+= mkesdb_static -.endif - .include SUBDIR_PARALLEL= diff --git a/usr.bin/mkcsmapper/Makefile b/usr.bin/mkcsmapper/Makefile --- a/usr.bin/mkcsmapper/Makefile +++ b/usr.bin/mkcsmapper/Makefile @@ -3,6 +3,12 @@ .PATH: ${SRCTOP}/lib/libc/iconv PROG= mkcsmapper +.if defined(BOOTSTRAPPING) +# When bootstrapping, the host libc might not contain these expected symbols +# so compile them directly into the binary. +SRCS= citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \ + citrus_lookup_factory.c citrus_pivot_factory.c +.endif LDFLAGS+= -L${SRCTOP}/lib/libc NO_WMISSING_VARIABLE_DECLARATIONS= diff --git a/usr.bin/mkcsmapper_static/Makefile b/usr.bin/mkcsmapper_static/Makefile deleted file mode 100644 --- a/usr.bin/mkcsmapper_static/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# $FreeBSD$ - -.PATH: ${SRCTOP}/lib/libc/iconv ${SRCTOP}/usr.bin/mkcsmapper - -PROG= mkcsmapper_static -SRCS= citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \ - citrus_lookup_factory.c citrus_pivot_factory.c -MAN= -.if !defined(BOOSTRAPPING) -# None of the other bootstrap tools are built static and this breaks ASAN -NO_SHARED= yes -.endif -NO_WMISSING_VARIABLE_DECLARATIONS= - -build-tools: mkcsmapper_static - -.include "${SRCTOP}/usr.bin/mkcsmapper/Makefile.inc" -.include - -${PROG}: ${BUILD_TOOLS_META} diff --git a/usr.bin/mkcsmapper_static/Makefile.depend b/usr.bin/mkcsmapper_static/Makefile.depend deleted file mode 100644 --- a/usr.bin/mkcsmapper_static/Makefile.depend +++ /dev/null @@ -1,19 +0,0 @@ -# $FreeBSD$ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - gnu/lib/csu \ - include \ - include/arpa \ - include/xlocale \ - lib/${CSU_DIR} \ - lib/libc \ - lib/libcompiler_rt \ - usr.bin/yacc.host \ - - -.include - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif diff --git a/usr.bin/mkesdb/Makefile b/usr.bin/mkesdb/Makefile --- a/usr.bin/mkesdb/Makefile +++ b/usr.bin/mkesdb/Makefile @@ -3,6 +3,12 @@ .PATH: ${SRCTOP}/lib/libc/iconv PROG= mkesdb +.if defined(BOOTSTRAPPING) +# When bootstrapping, the host libc might not contain these expected symbols +# so compile them directly into the binary. +SRCS= citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \ + citrus_lookup_factory.c +.endif NO_WMISSING_VARIABLE_DECLARATIONS= diff --git a/usr.bin/mkesdb_static/Makefile b/usr.bin/mkesdb_static/Makefile deleted file mode 100644 --- a/usr.bin/mkesdb_static/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# $FreeBSD$ - -.PATH: ${SRCTOP}/lib/libc/iconv ${SRCTOP}/usr.bin/mkesdb - -PROG= mkesdb_static -SRCS= citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \ - citrus_lookup_factory.c -MAN= -.if !defined(BOOSTRAPPING) -# None of the other bootstrap tools are built static and this breaks ASAN. -NO_SHARED= yes -.endif -NO_WMISSING_VARIABLE_DECLARATIONS= - -build-tools: mkesdb_static - -.include "${SRCTOP}/usr.bin/mkesdb/Makefile.inc" -.include - -${PROG}: ${BUILD_TOOLS_META} diff --git a/usr.bin/mkesdb_static/Makefile.depend b/usr.bin/mkesdb_static/Makefile.depend deleted file mode 100644 --- a/usr.bin/mkesdb_static/Makefile.depend +++ /dev/null @@ -1,19 +0,0 @@ -# $FreeBSD$ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - gnu/lib/csu \ - include \ - include/arpa \ - include/xlocale \ - lib/${CSU_DIR} \ - lib/libc \ - lib/libcompiler_rt \ - usr.bin/yacc.host \ - - -.include - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif