Skip to content

Commit 8b5fe8c

Browse files
committed
Revert "Link against libiconv on IRIX"
Brandon Casey reports: Subject: Re: [PATCH] Link against libiconv on IRIX Date: Mon, 05 Apr 2010 11:45:32 -0500 Message-Id: <1UypQMCHLT57SnjSQIM66RTkLalsvavG8xXoQJv4rEQ@cipher.nrlssc.navy.mil> This breaks compilation on IRIX 6.5.29m for me since there is no separate libiconv.so. What version of IRIX are you using? On my system, even the iconv utility doesn't link against a libiconv shared object. It seems the iconv functionality is in libc. # ldd /usr/bin/iconv libc.so.1 => /usr/lib32/libc.so.1 Could it be that you are using a third party iconv library? I've experienced this on another system and the problem was related to curl. In that case, curl was linked against an external iconv and not the native library, so if I tried to build with curl support, I had to also build against the external iconv library. While we wait for an improved solution, revert the regression caused by 2170422.
1 parent 11766ca commit 8b5fe8c

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,6 @@ ifeq ($(uname_S),IRIX)
922922
SNPRINTF_RETURNS_BOGUS = YesPlease
923923
SHELL_PATH = /usr/gnu/bin/bash
924924
NEEDS_LIBGEN = YesPlease
925-
NEEDS_LIBICONV = YesPlease
926925
endif
927926
ifeq ($(uname_S),IRIX64)
928927
NO_SETENV=YesPlease
@@ -941,7 +940,6 @@ ifeq ($(uname_S),IRIX64)
941940
SNPRINTF_RETURNS_BOGUS = YesPlease
942941
SHELL_PATH=/usr/gnu/bin/bash
943942
NEEDS_LIBGEN = YesPlease
944-
NEEDS_LIBICONV = YesPlease
945943
endif
946944
ifeq ($(uname_S),HP-UX)
947945
NO_IPV6=YesPlease

0 commit comments

Comments
 (0)