diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc.inc | 11 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.16.bb | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc index 3d136bf8d7..1e041977de 100644 --- a/meta/recipes-core/eglibc/eglibc.inc +++ b/meta/recipes-core/eglibc/eglibc.inc | |||
@@ -8,6 +8,17 @@ PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" | |||
8 | 8 | ||
9 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" | 9 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" |
10 | 10 | ||
11 | # eglibc can't be built without optimization, if someone tries to compile an | ||
12 | # entire image as -O0, we override it with -O2 here and give a note about it. | ||
13 | def get_optimization(d): | ||
14 | selected_optimization = d.getVar("SELECTED_OPTIMIZATION", True) | ||
15 | if base_contains("SELECTED_OPTIMIZATION", "-O0", "x", "", d) == "x": | ||
16 | bb.note("eglibc can't be built with -O0, -O2 will be used instead.") | ||
17 | return selected_optimization.replace("-O0", "-O2") | ||
18 | return selected_optimization | ||
19 | |||
20 | SELECTED_OPTIMIZATION := "${@get_optimization(d)}" | ||
21 | |||
11 | # siteconfig.bbclass runs configure which needs a working compiler | 22 | # siteconfig.bbclass runs configure which needs a working compiler |
12 | # For the compiler to work we need a working libc yet libc isn't | 23 | # For the compiler to work we need a working libc yet libc isn't |
13 | # in the sysroots directory at this point. This means the libc.so | 24 | # in the sysroots directory at this point. This means the libc.so |
diff --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.16.bb index 71bcc308b3..aa9256cdc1 100644 --- a/meta/recipes-core/eglibc/eglibc_2.16.bb +++ b/meta/recipes-core/eglibc/eglibc_2.16.bb | |||
@@ -87,17 +87,6 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ | |||
87 | 87 | ||
88 | EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" | 88 | EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" |
89 | 89 | ||
90 | # eglibc can't be built without optimization, if someone tries to compile an | ||
91 | # entire image as -O0, we override it with -O2 here and give a note about it. | ||
92 | def get_optimization(d): | ||
93 | selected_optimization = d.getVar("SELECTED_OPTIMIZATION", True) | ||
94 | if base_contains("SELECTED_OPTIMIZATION", "-O0", "x", "", d) == "x": | ||
95 | bb.note("eglibc can't be built with -O0, -O2 will be used instead.") | ||
96 | return selected_optimization.replace("-O0", "-O2") | ||
97 | return selected_optimization | ||
98 | |||
99 | SELECTED_OPTIMIZATION := "${@get_optimization(d)}" | ||
100 | |||
101 | do_unpack_append() { | 90 | do_unpack_append() { |
102 | bb.build.exec_func('do_move_ports', d) | 91 | bb.build.exec_func('do_move_ports', d) |
103 | } | 92 | } |