summaryrefslogtreecommitdiff
path: root/package/base-files
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-07-28 14:19:02 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-07-28 14:19:02 +0000
commit088ae0f64db4a3e4889fc2e8d689637d6eb4e0f0 (patch)
tree9a7dd2f1be056c619947ffa9b19dce0caa562f71 /package/base-files
parent1e17c0d5a1cf9ad08b67468fa574b7725c158e58 (diff)
fix libraries packaging for uml on x86_64
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11970 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files')
-rw-r--r--package/base-files/Makefile11
1 files changed, 7 insertions, 4 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index bec33c8e05..5ab776df51 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -22,6 +22,9 @@ ifneq ($(DUMP),1)
TARGET:=$(TARGET)-$(PROFILE)
endif
LIBGCC_VERSION:=$(GCC_VERSION)
+ ifeq ($(ARCH),x86_64)
+ LIB_SUFFIX:=64
+ endif
else
UCLIBC_VERSION:=<UCLIBC_VERSION>
LIBGCC_VERSION:=<LIBGCC_VERSION>
@@ -173,19 +176,19 @@ endef
define Package/libgcc/install
$(INSTALL_DIR) $(1)/lib
- $(CP) $(TOOLCHAIN_DIR)/lib/libgcc_s.so.* $(1)/lib/
+ $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libgcc_s.so.* $(1)/lib/
endef
ifeq ($(word 1,$(subst ., ,$(LIBGCC_VERSION))),4)
define Package/libssp/install
$(INSTALL_DIR) $(1)/lib
- $(CP) $(TOOLCHAIN_DIR)/lib/libssp.so.* $(1)/lib/
+ $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libssp.so.* $(1)/lib/
endef
endif
define Package/libstdcpp/install
$(INSTALL_DIR) $(1)/lib
- $(CP) $(TOOLCHAIN_DIR)/lib/libstdc++.so.* $(1)/lib/
+ $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libstdc++.so.* $(1)/lib/
endef
define Package/libpthread/install
@@ -196,7 +199,7 @@ endef
define Package/uclibc/install
$(INSTALL_DIR) $(1)/lib
- for file in ld-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \
+ for file in ld$(LIB_SUFFIX)-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \
$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \
$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(UCLIBC_VERSION).so $(1)/lib/; \
done