diff options
| author | Andre McCurdy <armccurdy@gmail.com> | 2018-05-29 14:29:47 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-03 16:54:22 +0100 |
| commit | 996bcb143cb8755cadb986e084b5f24e3ffdb03b (patch) | |
| tree | 718bcf5de03bdcf9648c0e65d5216a45b39330c0 | |
| parent | d47245b038d27aa5228052af71d973b9ac1c3a46 (diff) | |
| download | openembedded-core-996bcb143cb8755cadb986e084b5f24e3ffdb03b.tar.gz openembedded-core-996bcb143cb8755cadb986e084b5f24e3ffdb03b.tar.bz2 openembedded-core-996bcb143cb8755cadb986e084b5f24e3ffdb03b.zip | |
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).
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/conf/bitbake.conf | 4 | ||||
| -rw-r--r-- | meta/conf/distro/include/as-needed.inc | 4 | ||||
| -rw-r--r-- | meta/conf/distro/include/tcmode-default.inc | 3 |
3 files changed, 3 insertions, 8 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 15f6da71cc..fab3dcccba 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -585,8 +585,10 @@ LINKER_HASH_STYLE_mipsarch = "sysv" TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][d.getVar('LINKER_HASH_STYLE') != 'gnu']}" +ASNEEDED ?= "-Wl,--as-needed" + export LDFLAGS = "${TARGET_LDFLAGS}" -export TARGET_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE}" +export TARGET_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE} ${ASNEEDED}" # Pass parallel make options to the compile task EXTRA_OEMAKE_prepend_task-compile = "${PARALLEL_MAKE} " 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 @@ - -ASNEEDED = "-Wl,--as-needed" - -TARGET_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}" PREFERRED_VERSION_nativesdk-glibc-initial ?= "${GLIBCVERSION}" PREFERRED_VERSION_cross-localedef-native ?= "${GLIBCVERSION}" - PREFERRED_VERSION_qemu ?= "${QEMUVERSION}" PREFERRED_VERSION_qemu-native ?= "${QEMUVERSION}" PREFERRED_VERSION_nativesdk-qemu ?= "${QEMUVERSION}" -# Setup suitable toolchain flags -require conf/distro/include/as-needed.inc GOVERSION ?= "1.9%" PREFERRED_VERSION_virtual/${TARGET_PREFIX}go ?= "${GOVERSION}" |