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 /include/Makefile | |
| 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 'include/Makefile')
| -rw-r--r-- | include/Makefile | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/include/Makefile b/include/Makefile index 61435cc..7032450 100644 --- a/include/Makefile +++ b/include/Makefile @@ -83,15 +83,7 @@ _netipx= netipx # Handle the #define aliases for libiconv .if ${MK_ICONV} == "yes" -CLEANFILES+= _libiconv_compat.h -INCS+= _libiconv_compat.h iconv.h -_libiconv_compat.h: ${.CURDIR}/Makefile - echo "/* Indicate whether libiconv symbols are present */" > _libiconv_compat.h -.if ${MK_LIBICONV_COMPAT} == "yes" - echo "#define __LIBICONV_COMPAT" >> _libiconv_compat.h -.else - echo "#undef __LIBICONV_COMPAT" >> _libiconv_compat.h -.endif +INCS+= iconv.h .endif |
