diff options
author | Bjoern A. Zeeb <bz@FreeBSD.org> | 2021-08-19 17:27:04 +0000 |
---|---|---|
committer | Kyle Evans <kevans@FreeBSD.org> | 2021-08-19 17:38:17 +0000 |
commit | 298ee47e1988a120249b24470c2c7c45f8c4359f (patch) | |
tree | bbe98f146387b9f74a996365243fd2ed1b730c8b /Makefile.inc1 | |
parent | c81ea895b563c4d1e39468a8525284b7474fe850 (diff) | |
download | src-298ee47e1988a120249b24470c2c7c45f8c4359f.tar.gz src-298ee47e1988a120249b24470c2c7c45f8c4359f.zip |
localedef: unbreak WITHOUT_LOCALES
After 0fa5403d493b ("pkgbase: move locales into their own package") we
need usr.bin/localedef as a bootstrap tool independent on where
WITHOUT_LOCALE was specified as we ALWAYS process C.UTF-8.
At the same time LOCALES= in the local Makefile is empty but
C.UTF-8 with WITHOUT_LOCALES. C.UTF-8 is excluded from FILES, and thus
after the replacement FILES= is set to only .LC_CTYPE which results in
a build failure not knowing how to build that. Tweak the substitution to
replace only non-empty words so that FILES remains harmlessly empty.
Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D31589
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index eb69d660cede..5bb2412e4042 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2353,10 +2353,9 @@ ${_bt}-usr.bin/clang/llvm-tblgen: ${_bt}-lib/clang/libllvmminimal ${_bt}-usr.bin/clang/lldb-tblgen: ${_bt}-lib/clang/libllvmminimal .endif -.if ${MK_LOCALES} != "no" +# C.UTF-8 is always built in share/ctypes and we need localedef for that. _localedef= usr.bin/localedef ${_bt}-usr.bin/localedef: ${_bt}-usr.bin/yacc ${_bt_lex_depend} -.endif .if ${MK_ICONV} != "no" _mkesdb= usr.bin/mkesdb |