[CONSOLIDATED,PULL,11/14] image-mklibs.bbclass: Utilize ${base_libdir} instead of static /lib

Submitted by Saul Wold on Aug. 5, 2011, 3:28 p.m.

Details

Message ID ac6612520552341628acdbde974152ee4e7403fe.1312557813.git.sgw@linux.intel.com
State New, archived
Headers show

Commit Message

Saul Wold Aug. 5, 2011, 3:28 p.m.
From: Kumar Gala <galak@kernel.crashing.org>

We might redefine ${base_libdir} from being set to just /lib.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 meta/classes/image-mklibs.bbclass |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta/classes/image-mklibs.bbclass b/meta/classes/image-mklibs.bbclass
index d6630c4..69dac2f 100644
--- a/meta/classes/image-mklibs.bbclass
+++ b/meta/classes/image-mklibs.bbclass
@@ -17,19 +17,19 @@  mklibs_optimize_image_doit() {
 
 	case ${TARGET_ARCH} in
 		powerpc | mips | microblaze )
-			dynamic_loader="/lib/ld.so.1"
+			dynamic_loader="${base_libdir}/ld.so.1"
 			;;
 		powerpc64)
 			dynamic_loader="${base_libdir}/ld64.so.1"
 			;;
 		x86_64)
-			dynamic_loader="/lib/ld-linux-x86-64.so.2"
+			dynamic_loader="${base_libdir}/ld-linux-x86-64.so.2"
 			;;
 		i586 )
-			dynamic_loader="/lib/ld-linux.so.2"
+			dynamic_loader="${base_libdir}/ld-linux.so.2"
 			;;
 		arm )
-			dynamic_loader="/lib/ld-linux.so.3"
+			dynamic_loader="${base_libdir}/ld-linux.so.3"
 			;;
 		* )
 			dynamic_loader="/unknown_dynamic_linker"