diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-09 17:00:14 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-09 17:00:14 +0100 |
| commit | 15508d22d00277a1f2a1022dce38f2772c810d32 (patch) | |
| tree | b9aa22a9fc97ff54bc5677df5624b4ee91b56fe2 | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff) | |
| download | linux-15508d22d00277a1f2a1022dce38f2772c810d32.tar.xz linux-15508d22d00277a1f2a1022dce38f2772c810d32.zip | |
Revert "[PATCH] kconfig: detect if -lintl is needed when linking conf,mconf"
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>
| -rw-r--r-- | scripts/kconfig/Makefile | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index d64aae85c378..5760e057ecba 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -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 |