diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/conf/bitbake.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 442fd4693c..01f064cbc6 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -502,6 +502,7 @@ DEBUG_FLAGS ?= "-g -feliminate-unused-debug-types" | |||
502 | FULL_OPTIMIZATION = "-O2 -pipe ${DEBUG_FLAGS}" | 502 | FULL_OPTIMIZATION = "-O2 -pipe ${DEBUG_FLAGS}" |
503 | DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer ${DEBUG_FLAGS} -pipe" | 503 | DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer ${DEBUG_FLAGS} -pipe" |
504 | SELECTED_OPTIMIZATION = "${@bb.data.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][d.getVar('DEBUG_BUILD', 1) == '1'], d, 1)}" | 504 | SELECTED_OPTIMIZATION = "${@bb.data.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][d.getVar('DEBUG_BUILD', 1) == '1'], d, 1)}" |
505 | SELECTED_OPTIMIZATION[vardeps] += "FULL_OPTIMIZATION DEBUG_OPTIMIZATION" | ||
505 | BUILD_OPTIMIZATION = "-O2 -pipe" | 506 | BUILD_OPTIMIZATION = "-O2 -pipe" |
506 | 507 | ||
507 | ################################################################## | 508 | ################################################################## |
@@ -713,7 +714,7 @@ COMBINED_FEATURES = "\ | |||
713 | ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \ | 714 | ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \ |
714 | ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)} \ | 715 | ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)} \ |
715 | ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}" | 716 | ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}" |
716 | 717 | COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES" | |
717 | 718 | ||
718 | # Make sure MACHINE isn't exported | 719 | # Make sure MACHINE isn't exported |
719 | # (breaks binutils at least) | 720 | # (breaks binutils at least) |