summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-07 16:01:56 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-10 13:24:05 +0000
commitf46cdcbbae0ac3cbce423d262358e670add6065e (patch)
treecfa2fa40765c6d6a9b089ccf4998b18651f5d9bf
parentc036d1a5a0d90f8bbc274613d7ba800166fd46f1 (diff)
downloadpoky-f46cdcbbae0ac3cbce423d262358e670add6065e.tar.gz
bitbake/poky.conf: Add TARGET_LINK_HASH_STYLE option to TARGET_LDFLAGS as per OE.dev
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/bitbake.conf3
-rw-r--r--meta/conf/distro/poky.conf2
2 files changed, 4 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 30fcc7947b..edc494111f 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -449,8 +449,9 @@ BUILDSDK_LDFLAGS = "-L${STAGING_LIBDIR} \
449 -Wl,-rpath-link,${STAGING_DIR_HOST}${base_libdir} \ 449 -Wl,-rpath-link,${STAGING_DIR_HOST}${base_libdir} \
450 -Wl,-rpath,${base_libdir} -Wl,-O1" 450 -Wl,-rpath,${base_libdir} -Wl,-O1"
451 451
452TARGET_LINK_HASH_STYLE ??= ""
452export LDFLAGS = "${TARGET_LDFLAGS}" 453export LDFLAGS = "${TARGET_LDFLAGS}"
453export TARGET_LDFLAGS = "-Wl,-O1" 454export TARGET_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE}"
454#export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${libdir} \ 455#export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${libdir} \
455# -Wl,-rpath-link,${STAGING_DIR_TARGET}${libdir} \ 456# -Wl,-rpath-link,${STAGING_DIR_TARGET}${libdir} \
456# -Wl,-O1" 457# -Wl,-O1"
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index e6ef465052..1c5c72104b 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -22,6 +22,8 @@ TARGET_FPU_arm ?= "soft"
22TARGET_FPU_armeb ?= "soft" 22TARGET_FPU_armeb ?= "soft"
23TARGET_FPU_nokia800 = "hard" 23TARGET_FPU_nokia800 = "hard"
24 24
25TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH', d, True) in ['mips', 'mipsel', 'mips64', 'mips64el']]}"
26
25QA_LOGFILE = "${TMPDIR}/qa.log" 27QA_LOGFILE = "${TMPDIR}/qa.log"
26 28
27IMAGE_ROOTFS_SIZE_ext2 ?= "131072" 29IMAGE_ROOTFS_SIZE_ext2 ?= "131072"