diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-09 11:00:14 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-09 11:00:14 -0500 |
commit | 15508d22d00277a1f2a1022dce38f2772c810d32 (patch) | |
tree | b9aa22a9fc97ff54bc5677df5624b4ee91b56fe2 /scripts/kconfig/Makefile | |
parent | 0bdd340c092b0936f78a54bdbd3927463ed4fca3 (diff) |
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>
Diffstat (limited to 'scripts/kconfig/Makefile')
-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 \ | |||
123 | then echo yes ; \ | 123 | then echo yes ; \ |
124 | else echo no ; fi) | 124 | else echo no ; fi) |
125 | ifeq ($(KBUILD_HAVE_NLS),no) | 125 | ifeq ($(KBUILD_HAVE_NLS),no) |
126 | HOSTCFLAGS += -DKBUILD_NO_NLS | 126 | HOSTCFLAGS += -DKBUILD_NO_NLS |
127 | else | ||
128 | KBUILD_NEED_LINTL := $(shell \ | ||
129 | if echo -e "\#include <libintl.h>\nint main(int a, char** b) { gettext(\"\"); return 0; }\n" | \ | ||
130 | $(HOSTCC) $(HOSTCFLAGS) -x c - -o /dev/null> /dev/null 2>&1 ; \ | ||
131 | then echo no ; \ | ||
132 | else echo yes ; fi) | ||
133 | ifeq ($(KBUILD_NEED_LINTL),yes) | ||
134 | HOSTLOADLIBES_conf += -lintl | ||
135 | HOSTLOADLIBES_mconf += -lintl | ||
136 | endif | ||
137 | endif | 127 | endif |
138 | 128 | ||
139 | # generated files seem to need this to find local include files | 129 | # generated files seem to need this to find local include files |