Merge branch 'js/objc-funchdr'

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index 7db2ccc2962bea08c2dc944cdf8583733e670a12..308dc70b5de118083a14bcb2665372a40ae6522c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -649,8 +649,8 @@ ifeq ($(uname_S),SunOS)
        NO_MEMMEM = YesPlease
        NO_HSTRERROR = YesPlease
        NO_MKDTEMP = YesPlease
+       OLD_ICONV = UnfortunatelyYes
        ifeq ($(uname_R),5.8)
-               NEEDS_LIBICONV = YesPlease
                NO_UNSETENV = YesPlease
                NO_SETENV = YesPlease
                NO_C99_FORMAT = YesPlease