]> err.no Git - linux-2.6/commitdiff
Revert "[PATCH] kconfig: detect if -lintl is needed when linking conf,mconf"
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 9 Feb 2006 16:00:14 +0000 (08:00 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 9 Feb 2006 16:00:14 +0000 (08:00 -0800)
This reverts commit 5e375bc7d586e0df971734a5a5f1f080ffd89b68.

Kyle McMartin steps on his soap-box:

  "Sigh.  Can everyone please stop assuming gcc can output to /dev/null?
   On several platforms, ld tries to lseek in the output file, and fails
   if it can't."

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
scripts/kconfig/Makefile

index d64aae85c3788e10036b772baed84217d08d1bd2..5760e057ecbac174679bedfe60de520645ec659a 100644 (file)
@@ -123,17 +123,7 @@ KBUILD_HAVE_NLS := $(shell \
      then echo yes ; \
      else echo no ; fi)
 ifeq ($(KBUILD_HAVE_NLS),no)
-  HOSTCFLAGS   += -DKBUILD_NO_NLS
-else
-  KBUILD_NEED_LINTL := $(shell \
-    if echo -e "\#include <libintl.h>\nint main(int a, char** b) { gettext(\"\"); return 0; }\n" | \
-      $(HOSTCC) $(HOSTCFLAGS) -x c - -o /dev/null> /dev/null 2>&1 ; \
-    then echo no ; \
-    else echo yes ; fi)
-  ifeq ($(KBUILD_NEED_LINTL),yes)
-    HOSTLOADLIBES_conf += -lintl
-    HOSTLOADLIBES_mconf        += -lintl
-  endif
+HOSTCFLAGS     += -DKBUILD_NO_NLS
 endif
 
 # generated files seem to need this to find local include files