tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Detecting arm-linux-gnueabihf



Hi,

on raspbian I had to make the following change to help it find libc.so.6:

diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index 4f1741a..5acffb4 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -59,9 +59,14 @@ _OPSYS_SYSTEM_RPATH= /lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}:/lib/i386-linux
 _OPSYS_LIB_DIRS?=      /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX} /lib/i386-linux-gnu /usr/lib/i386-linux-gnu
 .endif
 .if !empty(MACHINE_ARCH:Marm*)
+.if exists(/etc/ld.so.conf.d/arm-linux-gnueabihf.conf)
+_OPSYS_SYSTEM_RPATH=   /lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}:/lib/arm-linux-gnueabihf:/usr/lib/arm-linux-gnueabihf
+_OPSYS_LIB_DIRS?=      /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX} /lib/arm-linux-gnueabihf /usr/lib/arm-linux-gnueabihf
+.else
 _OPSYS_SYSTEM_RPATH=   /lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}:/lib/arm-linux-gnueabi:/usr/lib/arm-linux-gnueabi
 _OPSYS_LIB_DIRS?=      /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX} /lib/arm-linux-gnueabi /usr/lib/arm-linux-gnueabi
 .endif
+.endif
 .else
 _OPSYS_SYSTEM_RPATH=   /lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}
 _OPSYS_LIB_DIRS?=      /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX}
 
 I am not sure if testing the existence of /etc/ld.so.conf.d/arm-linux-gnueabihf.conf is the best way to solve this.
 I'd be happy to hear better solutions or if this is ok to commit.
 
 Thanks!
 
 Best regards,
 Sebastian


Home | Main Index | Thread Index | Old Index