summaryrefslogtreecommitdiffstats
path: root/meta/conf/distro
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-05-29 14:29:47 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-04 15:15:00 +0100
commit0a2f61a0d44a7dd635d5119de186f5efbc81a169 (patch)
tree494e3eeb48f294fd839e537331b59f871111dcfa /meta/conf/distro
parent77a0b5e9a4c2f5a4a1e5e68fa7e871b775341b70 (diff)
downloadpoky-0a2f61a0d44a7dd635d5119de186f5efbc81a169.tar.gz
bitbake.conf: include ASNEEDED in TARGET_LDFLAGS directly
Previously, ASNEEDED was appended to TARGET_LDFLAGS from as-needed.inc via tcmode-default.inc and so may not have been enabled for external toolchain builds or other configurations which over-ride TCMODE (ie builds which do not include tcmode-default.inc). Include ASNEEDED in TARGET_LDFLAGS directly from bitbake.conf to ensure that the optimisation is applied to all builds (and for consistency with the way that TARGET_LINK_HASH_STYLE is handled). (From OE-Core rev: 996bcb143cb8755cadb986e084b5f24e3ffdb03b) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/distro')
-rw-r--r--meta/conf/distro/include/as-needed.inc4
-rw-r--r--meta/conf/distro/include/tcmode-default.inc3
2 files changed, 0 insertions, 7 deletions
diff --git a/meta/conf/distro/include/as-needed.inc b/meta/conf/distro/include/as-needed.inc
deleted file mode 100644
index b163fef683..0000000000
--- a/meta/conf/distro/include/as-needed.inc
+++ /dev/null
@@ -1,4 +0,0 @@
1
2ASNEEDED = "-Wl,--as-needed"
3
4TARGET_LDFLAGS += "${ASNEEDED}"
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 4b58df0459..d85fd1e921 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -65,12 +65,9 @@ PREFERRED_VERSION_glibc-initial ?= "${GLIBCVERSION}"
65PREFERRED_VERSION_nativesdk-glibc-initial ?= "${GLIBCVERSION}" 65PREFERRED_VERSION_nativesdk-glibc-initial ?= "${GLIBCVERSION}"
66PREFERRED_VERSION_cross-localedef-native ?= "${GLIBCVERSION}" 66PREFERRED_VERSION_cross-localedef-native ?= "${GLIBCVERSION}"
67 67
68
69PREFERRED_VERSION_qemu ?= "${QEMUVERSION}" 68PREFERRED_VERSION_qemu ?= "${QEMUVERSION}"
70PREFERRED_VERSION_qemu-native ?= "${QEMUVERSION}" 69PREFERRED_VERSION_qemu-native ?= "${QEMUVERSION}"
71PREFERRED_VERSION_nativesdk-qemu ?= "${QEMUVERSION}" 70PREFERRED_VERSION_nativesdk-qemu ?= "${QEMUVERSION}"
72# Setup suitable toolchain flags
73require conf/distro/include/as-needed.inc
74 71
75GOVERSION ?= "1.9%" 72GOVERSION ?= "1.9%"
76PREFERRED_VERSION_virtual/${TARGET_PREFIX}go ?= "${GOVERSION}" 73PREFERRED_VERSION_virtual/${TARGET_PREFIX}go ?= "${GOVERSION}"