summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/config.mk4
-rw-r--r--config/libc.in7
-rw-r--r--config/libc/glibc-eglibc.in-common4
3 files changed, 8 insertions, 7 deletions
diff --git a/config/config.mk b/config/config.mk
index 5997056..f3b6715 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -107,6 +107,10 @@ 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)
endef
diff --git a/config/libc.in b/config/libc.in
index a373990..394db6f 100644
--- a/config/libc.in
+++ b/config/libc.in
@@ -63,13 +63,6 @@ config THREADS_NONE
endchoice
-# Hack: mconf does not allow to include a file multiple times,
-# so include glibc and eglibc common options from here, rather
-# than from each config files.
-if LIBC_glibc || LIBC_eglibc
-source config/libc/glibc-eglibc.in-common
-endif
-
endmenu
endif # ! BARE_METAL
diff --git a/config/libc/glibc-eglibc.in-common b/config/libc/glibc-eglibc.in-common
index 279f2c6..863f0fe 100644
--- a/config/libc/glibc-eglibc.in-common
+++ b/config/libc/glibc-eglibc.in-common
@@ -1,6 +1,8 @@
# This file contains the common configuration options
# that apply to both glibc and eglibc.
+if LIBC_glibc || LIBC_eglibc
+
comment "glibc/eglibc common options"
config LIBC_GLIBC_EXTRA_CONFIG
@@ -152,3 +154,5 @@ config LIBC_GLIBC_MIN_KERNEL
default LIBC_GLIBC_MIN_KERNEL_VERSION if LIBC_GLIBC_USE_HEADERS_MIN_KERNEL
endif # KERNEL_linux
+
+endif # LIBC_glibc || LIBC_eglibc