Skip to content

Commit 0e214af

Browse files
peffspearce
authored andcommitted
Makefile: do not set NEEDS_LIBICONV for Solaris 8
This breaks my build on Solaris 8, as there is no separate libiconv. The history of this line is somewhat convoluted. In 2fd955c (in November 2005), NEEDS_LIBICONV was turned on for all Solaris builds, claiming to "fix an error in Solaris 10 by setting NEEDS_LIBICONV". Later, e15f545 (in February of 2006) claimed that "Solaris 9+ don't need iconv", and moved NEEDS_LIBICONV into a section for Solaris 8. Furthermore, Brandon Casey claims in <5A1KxlhmUIHe8iXPxnXYuNXsq0Yjlbwkz2eBin3z7ELuL9nK-4tSpw@cipher.nrlssc.navy.mil> that he does not set NEEDS_LIBICONV for Solaris 7. So either one of those commits is totally wrong, or there is some other magic going on where some Solaris installs need it and others don't. Given Brandon's statement and my problems on Solaris 8 with NEEDS_LIBICONV, I am inclined to think the first commit was bogus, and that NEEDS_LIBICONV shouldn't be set for Solaris at all by default. If somebody wants to use iconv and has installed it manually, they can set it in their config.mak. Signed-off-by: Jeff King <[email protected]> Signed-off-by: Shawn O. Pearce <[email protected]>
1 parent 9a1fd65 commit 0e214af

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,6 @@ ifeq ($(uname_S),SunOS)
639639
NO_MKDTEMP = YesPlease
640640
OLD_ICONV = UnfortunatelyYes
641641
ifeq ($(uname_R),5.8)
642-
NEEDS_LIBICONV = YesPlease
643642
NO_UNSETENV = YesPlease
644643
NO_SETENV = YesPlease
645644
NO_C99_FORMAT = YesPlease

0 commit comments

Comments
 (0)