summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Brandon Casey <drafnel@gmail.com>2009-08-27 10:35:46 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-08-27 16:20:10 -0700
commitb42c9af2cd3dcc56c8aae9a7d73ed1fc342e1f02 (patch)
treed115946c70ed45a809fd5ddab6d0410e95e983ef
parentMerge branch 'maint' (diff)
downloadtgif-b42c9af2cd3dcc56c8aae9a7d73ed1fc342e1f02.tar.xz
Makefile: remove pointless conditional assignment in SunOS section
It is true that NEEDS_RESOLV is needed on SunOS if NO_IPV6 is set since hstrerror() resides in libresolv, but performing this test at its current location is not very useful. It will only have any effect if the user modifies the make variables from the make command line, and will have no effect if a config.mak file is used. A better location for this conditional would have been further down in the Makefile after the config.mak and config.mak.autogen had been parsed. Rather than adding clutter to the Makefile for a conditional that will likely never be triggered, just remove it, and any user on SunOS that manually sets NO_IPV6 can also set NEEDS_RESOLV. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Makefile3
1 files changed, 0 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 66eedeff42..a9a4d89667 100644
--- a/Makefile
+++ b/Makefile
@@ -757,9 +757,6 @@ ifeq ($(uname_S),SunOS)
NO_C99_FORMAT = YesPlease
NO_STRTOUMAX = YesPlease
endif
- ifdef NO_IPV6
- NEEDS_RESOLV = YesPlease
- endif
INSTALL = /usr/ucb/install
TAR = gtar
BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H