diff options
author | peter <peter@FreeBSD.org> | 2013-11-03 19:04:57 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2013-11-03 19:04:57 +0000 |
commit | 2041181afbfef75d20a432523e8c92bc125acdd5 (patch) | |
tree | c2a94297b5ca505d69af7369b5c160a2d865ca62 /tools/build | |
parent | 49fe0daa4ff16ed937ed34112885e793900dbae2 (diff) | |
download | FreeBSD-src-2041181afbfef75d20a432523e8c92bc125acdd5.zip FreeBSD-src-2041181afbfef75d20a432523e8c92bc125acdd5.tar.gz |
Remove the WITH_LIBICONV_COMPAT hack that seems to do more harm than
good. This caused libc to spoof the ports libiconv namespace and
provide a colliding libiconv.so.3 to fool rtld. This should have
been removed some time ago.
Diffstat (limited to 'tools/build')
-rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index fdf1104..b972881 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -3136,13 +3136,6 @@ OLD_FILES+=usr/share/man/man1/host.1.gz # to be filled in #.endif -.if ${MK_LIBICONV_COMPAT} == no -OLD_FILES+=usr/lib/libiconv.a -OLD_FILES+=usr/lib/libiconv.so -OLD_FILES+=usr/lib/libiconv.so.3 -OLD_FILES+=usr/lib/libiconv_p.a -.endif - .if ${MK_LIBCPLUSPLUS} == no OLD_LIBS+=lib/libcxxrt.so.1 OLD_FILES+=usr/lib/libc++.a |