diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-07 16:01:56 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-10 13:24:05 +0000 |
commit | f46cdcbbae0ac3cbce423d262358e670add6065e (patch) | |
tree | cfa2fa40765c6d6a9b089ccf4998b18651f5d9bf | |
parent | c036d1a5a0d90f8bbc274613d7ba800166fd46f1 (diff) | |
download | poky-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.conf | 3 | ||||
-rw-r--r-- | meta/conf/distro/poky.conf | 2 |
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 | ||
452 | TARGET_LINK_HASH_STYLE ??= "" | ||
452 | export LDFLAGS = "${TARGET_LDFLAGS}" | 453 | export LDFLAGS = "${TARGET_LDFLAGS}" |
453 | export TARGET_LDFLAGS = "-Wl,-O1" | 454 | export 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" | |||
22 | TARGET_FPU_armeb ?= "soft" | 22 | TARGET_FPU_armeb ?= "soft" |
23 | TARGET_FPU_nokia800 = "hard" | 23 | TARGET_FPU_nokia800 = "hard" |
24 | 24 | ||
25 | TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH', d, True) in ['mips', 'mipsel', 'mips64', 'mips64el']]}" | ||
26 | |||
25 | QA_LOGFILE = "${TMPDIR}/qa.log" | 27 | QA_LOGFILE = "${TMPDIR}/qa.log" |
26 | 28 | ||
27 | IMAGE_ROOTFS_SIZE_ext2 ?= "131072" | 29 | IMAGE_ROOTFS_SIZE_ext2 ?= "131072" |