diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2011-05-09 18:15:39 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2011-05-09 18:15:39 (GMT) |
| commit | f6037420148fda52e452637fa261fd295879d5e0 (patch) | |
| tree | 49f4defd81a44e0d153e5ca4ff34fc4bbc340a3f /config | |
| parent | 82250e56c7e218ef03298a04743573c8705147d4 (diff) | |
libc/glibc: use the multi-inclusion capability of the new kconfig
Now that kconfig can include a file multiple times, link the glibc/eglibc
common stuff to two .in.2 files.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.mk | 4 | ||||
| l--------- | config/libc/eglibc.in.2 | 1 | ||||
| -rw-r--r-- | config/libc/glibc-eglibc.in-common | 8 | ||||
| l--------- | config/libc/glibc.in.2 | 1 |
4 files changed, 3 insertions, 11 deletions
diff --git a/config/config.mk b/config/config.mk index 8cb63f8..1f9dc66 100644 --- a/config/config.mk +++ b/config/config.mk @@ -118,10 +118,6 @@ define build_gen_choice_in echo "source \"$${file}\""; \ echo "endif"; \ done; \ - echo ""; \ - for file in $(wildcard $(4)/*.in-common); do \ - echo "source \"$${file}\""; \ - done; \ ) >$(1) $(SILENT)(echo "# $(2) second part options"; \ echo "# Generated file, do not edit!!!"; \ diff --git a/config/libc/eglibc.in.2 b/config/libc/eglibc.in.2 new file mode 120000 index 0000000..01d33d4 --- /dev/null +++ b/config/libc/eglibc.in.2 @@ -0,0 +1 @@ +glibc-eglibc.in-common
\ No newline at end of file diff --git a/config/libc/glibc-eglibc.in-common b/config/libc/glibc-eglibc.in-common index 7b75fcb..f3310a7 100644 --- a/config/libc/glibc-eglibc.in-common +++ b/config/libc/glibc-eglibc.in-common @@ -1,8 +1,6 @@ # This file contains the common configuration options # that apply to both glibc and eglibc. -if LIBC_glibc || LIBC_eglibc - # Some architectures require the ports addon. List them one by one here: # This list must be carefully in sync with the architectures names # we can find in config/arch/* @@ -18,8 +16,6 @@ config LIBC_glibc_familly default y select BINUTILS_FORCE_LD_BFD -comment "glibc/eglibc common options" - config LIBC_GLIBC_EXTRA_CONFIG string prompt "extra config" @@ -152,7 +148,7 @@ endif if KERNEL_linux -choice +choice LIBC_GLIBC_SUPPORTED_KERNEL bool prompt "Minimum supported kernel version" default LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS @@ -247,5 +243,3 @@ config LIBC_GLIBC_MIN_KERNEL default LIBC_GLIBC_MIN_KERNEL_VERSION if LIBC_GLIBC_KERNEL_VERSION_CHOSEN endif # KERNEL_linux - -endif # LIBC_glibc || LIBC_eglibc diff --git a/config/libc/glibc.in.2 b/config/libc/glibc.in.2 new file mode 120000 index 0000000..01d33d4 --- /dev/null +++ b/config/libc/glibc.in.2 @@ -0,0 +1 @@ +glibc-eglibc.in-common
\ No newline at end of file |