diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2007-08-12 23:15:44 +0200 |
|---|---|---|
| committer | Sam Ravnborg <sam@neptun.(none)> | 2007-10-12 21:13:50 +0200 |
| commit | aa1e5ef5c1d95e7ebf0821d9ba27debe43a87a22 (patch) | |
| tree | 900a9fa8d090ab5323a4276e55b8108fa0d40568 | |
| parent | 4f4c4ee1b79b9102db19ff39f7cb11abddaa43e1 (diff) | |
| download | linux-3.10-aa1e5ef5c1d95e7ebf0821d9ba27debe43a87a22.tar.gz linux-3.10-aa1e5ef5c1d95e7ebf0821d9ba27debe43a87a22.tar.bz2 linux-3.10-aa1e5ef5c1d95e7ebf0821d9ba27debe43a87a22.zip | |
kbuild: check if we can link gettext not just compile
cygwin provides the header file but the lib file needs
to be added manually. A generic fix is to check if
we can compile and link a program that uses gettext()
and if it fails fall back to NO_NLS.
International users of cygwin may have to specify
HOST_LOADLIBES := "-lintl" on the make command line.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| -rw-r--r-- | scripts/kconfig/Makefile | 10 | ||||
| -rwxr-xr-x | scripts/kconfig/check.sh | 14 |
2 files changed, 16 insertions, 8 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 8986a48c8c4..bb08069b04a 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -143,14 +143,8 @@ clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \ .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c clean-files += mconf qconf gconf -# Needed for systems without gettext -KBUILD_HAVE_NLS := $(shell \ - if echo "\#include <libintl.h>" | $(HOSTCC) $(HOSTCFLAGS) -E - > /dev/null 2>&1 ; \ - then echo yes ; \ - else echo no ; fi) -ifeq ($(KBUILD_HAVE_NLS),no) -HOSTCFLAGS += -DKBUILD_NO_NLS -endif +# Add environment specific flags +HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCC) $(HOSTCFLAGS)) # generated files seem to need this to find local include files HOSTCFLAGS_lex.zconf.o := -I$(src) diff --git a/scripts/kconfig/check.sh b/scripts/kconfig/check.sh new file mode 100755 index 00000000000..fa59cbf9d62 --- /dev/null +++ b/scripts/kconfig/check.sh @@ -0,0 +1,14 @@ +#!/bin/sh +# Needed for systems without gettext +$* -xc -o /dev/null - > /dev/null 2>&1 << EOF +#include <libintl.h> +int main() +{ + gettext(""); + return 0; +} +EOF +if [ ! "$?" -eq "0" ]; then + echo -DKBUILD_NO_NLS; +fi + |