diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2012-10-11 12:11:54 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2012-10-11 12:11:54 +0200 |
| commit | 2a7f12012c92cc4d4bc475f07a788316f0e95030 (patch) | |
| tree | f95ab47ee264bfb92ef6ffa1d3daf90db51532b2 | |
| parent | c2b8e42bf1d6a4e52ad27ba0ff50738227f7b52a (diff) | |
more libdir fixups
| -rw-r--r-- | mk/image.mk | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/mk/image.mk b/mk/image.mk index b432a32ce..36b76ec53 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -59,6 +59,33 @@ ifeq ($(ADK_TARGET_WITH_MULTILIB),y) rm -rf ${TARGET_DIR}/usr/lib/ ln -sf /usr/${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/usr/lib endif +ifeq ($(ADK_LINUX_X86_64),y) + # fixup lib dirs + mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} + rm -rf ${TARGET_DIR}/lib/ + ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib + mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} + rm -rf ${TARGET_DIR}/usr/lib/ + ln -sf /usr/${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/usr/lib +endif +ifeq ($(ADK_TARGET_ABI_N32),y) + # fixup lib dirs + mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} + rm -rf ${TARGET_DIR}/lib/ + ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib + mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} + rm -rf ${TARGET_DIR}/usr/lib/ + ln -sf /usr/${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/usr/lib +endif +ifeq ($(ADK_TARGET_ABI_N64),y) + # fixup lib dirs + mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} + rm -rf ${TARGET_DIR}/lib/ + ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib + mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} + rm -rf ${TARGET_DIR}/usr/lib/ + ln -sf /usr/${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/usr/lib +endif KERNEL_PKGDIR:=$(LINUX_BUILD_DIR)/kernel-pkg KERNEL_PKG:=$(PACKAGE_DIR)/kernel_$(KERNEL_VERSION)_$(CPU_ARCH).$(PKG_SUFFIX) |