Andrew's git / gitweb.git / diff
?
Merge branch 'jk/maint-soliconv' into maint
authorShawn O. Pearce <spearce@spearce.org>
Thu, 9 Oct 2008 16:08:43 +0000 (09:08 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Thu, 9 Oct 2008 16:08:43 +0000 (09:08 -0700)
* jk/maint-soliconv:
Makefile: do not set NEEDS_LIBICONV for Solaris 8

Makefile patch | blob | history
diff --git a/Makefile b/Makefile
index 7fad9f7ff6df54435659ec96f9611008b21fe27f..0d40f0ecca30a6c86f2f7016be02d8e936bc1dab 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -639,7 +639,6 @@ ifeq ($(uname_S),SunOS)
        NO_MKDTEMP = YesPlease
        OLD_ICONV = UnfortunatelyYes
        ifeq ($(uname_R),5.8)
-               NEEDS_LIBICONV = YesPlease
                NO_UNSETENV = YesPlease
                NO_SETENV = YesPlease
                NO_C99_FORMAT = YesPlease