From 5b00866362c846db2471314dc187d6676d870582 Mon Sep 17 00:00:00 2001
From: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>
Date: Sat, 27 Feb 2010 14:07:49 +0100
Subject: Packages: create and use LIBDIR environmental variable

Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>
---
 mk/strace.mk    | 2 +-
 mk/toolchain.mk | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'mk')

diff --git a/mk/strace.mk b/mk/strace.mk
index 10c8b64..6d1ae13 100644
--- a/mk/strace.mk
+++ b/mk/strace.mk
@@ -70,7 +70,7 @@ $(STRACE_BUILD_DIR)/.configured:
 	--build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
 	CC=$(TARGETCC_CACHED) \
 	CFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="-L$(SYSROOT)/lib" \
+	LDFLAGS="-L$(LIBDIR1) -L$(LIBDIR2)" \
 	CPPFLAGS="-I$(SYSROOT)/usr/include"
 	@touch $@
 
diff --git a/mk/toolchain.mk b/mk/toolchain.mk
index b15f9c1..107bc0b 100644
--- a/mk/toolchain.mk
+++ b/mk/toolchain.mk
@@ -37,6 +37,13 @@ CROSS_COMPILE := $(TOOLS)/bin/$(STRICT_GNU_TARGET)-
 export TARGETCC TARGETCXX TARGETAR TARGETRANLIB TARGETLD TARGETNM
 export TARGETSTRIP TARGETOBJDUMP TARGETOBJCOPY TARGET_CFLAGS CROSS_COMPILE
 
+ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y)
+LIBDIR=lib32
+else
+LIBDIR=lib
+endif
+export LIBDIR
+
 #ccache on host
 include $(EMBTK_ROOT)/mk/ccache.mk
 
-- 
cgit v1.2.3