diff options
Diffstat (limited to 'meta/recipes-core/uclibc/uclibc.inc')
-rw-r--r-- | meta/recipes-core/uclibc/uclibc.inc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc index c25c4d151a..86a7417f34 100644 --- a/meta/recipes-core/uclibc/uclibc.inc +++ b/meta/recipes-core/uclibc/uclibc.inc | |||
@@ -60,8 +60,10 @@ export V="2" | |||
60 | CFLAGS_arm := "${@oe_filter_out('-fno-omit-frame-pointer', '${CFLAGS}', d)}" | 60 | CFLAGS_arm := "${@oe_filter_out('-fno-omit-frame-pointer', '${CFLAGS}', d)}" |
61 | UCLIBC_EXTRA_CFLAGS := "${@oe_filter_out('(-I\S+|-i\S+)', '${CFLAGS}', d)}" | 61 | UCLIBC_EXTRA_CFLAGS := "${@oe_filter_out('(-I\S+|-i\S+)', '${CFLAGS}', d)}" |
62 | UCLIBC_EXTRA_LDFLAGS := "${@oe_filter_out('(-L\S+|-l\S+)', '${LDFLAGS}', d)}" | 62 | UCLIBC_EXTRA_LDFLAGS := "${@oe_filter_out('(-L\S+|-l\S+)', '${LDFLAGS}', d)}" |
63 | |||
63 | do_compile_prepend () { | 64 | do_compile_prepend () { |
64 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS | 65 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS |
66 | oe_runmake pregen | ||
65 | } | 67 | } |
66 | 68 | ||
67 | configmangle = '/^KERNEL_HEADERS/d; \ | 69 | configmangle = '/^KERNEL_HEADERS/d; \ |
@@ -146,8 +148,10 @@ do_configure() { | |||
146 | 148 | ||
147 | # Mangle the resulting .config depending on OE variables | 149 | # Mangle the resulting .config depending on OE variables |
148 | sed -i -e '${configmangle}' ${S}/merged.config | 150 | sed -i -e '${configmangle}' ${S}/merged.config |
151 | cp ${S}/merged.config .config | ||
152 | merge_config.sh -r -n -m .config ${@" ".join(find_cfgs(d))} | ||
153 | cml1_do_configure | ||
149 | 154 | ||
150 | oe_runmake KCONFIG_ALLCONFIG=${S}/merged.config allnoconfig | ||
151 | } | 155 | } |
152 | 156 | ||
153 | do_install() { | 157 | do_install() { |