Browse Source

multilib fix

Waldemar Brodkorb 13 years ago
parent
commit
3601bc7f44
1 changed files with 4 additions and 4 deletions
  1. 4 4
      mk/image.mk

+ 4 - 4
mk/image.mk

@@ -57,7 +57,7 @@ ifeq ($(ADK_TARGET_WITH_MULTILIB),y)
 	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
 	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
 	mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
 	mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
 	rm -rf ${TARGET_DIR}/usr/lib/
 	rm -rf ${TARGET_DIR}/usr/lib/
-	ln -sf /usr/${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/usr/lib
+	(cd ${TARGET_DIR}/lib ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
 endif
 endif
 ifeq ($(ADK_LINUX_X86_64),y)
 ifeq ($(ADK_LINUX_X86_64),y)
 	# fixup lib dirs
 	# fixup lib dirs
@@ -66,7 +66,7 @@ ifeq ($(ADK_LINUX_X86_64),y)
 	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
 	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
 	mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
 	mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
 	rm -rf ${TARGET_DIR}/usr/lib/
 	rm -rf ${TARGET_DIR}/usr/lib/
-	ln -sf /usr/${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/usr/lib
+	(cd ${TARGET_DIR}/lib ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
 endif
 endif
 ifeq ($(ADK_TARGET_ABI_N32),y)
 ifeq ($(ADK_TARGET_ABI_N32),y)
 	# fixup lib dirs
 	# fixup lib dirs
@@ -75,7 +75,7 @@ ifeq ($(ADK_TARGET_ABI_N32),y)
 	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
 	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
 	mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
 	mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
 	rm -rf ${TARGET_DIR}/usr/lib/
 	rm -rf ${TARGET_DIR}/usr/lib/
-	ln -sf /usr/${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/usr/lib
+	(cd ${TARGET_DIR}/lib ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
 endif
 endif
 ifeq ($(ADK_TARGET_ABI_N64),y)
 ifeq ($(ADK_TARGET_ABI_N64),y)
 	# fixup lib dirs
 	# fixup lib dirs
@@ -84,7 +84,7 @@ ifeq ($(ADK_TARGET_ABI_N64),y)
 	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
 	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
 	mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
 	mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
 	rm -rf ${TARGET_DIR}/usr/lib/
 	rm -rf ${TARGET_DIR}/usr/lib/
-	ln -sf /usr/${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/usr/lib
+	(cd ${TARGET_DIR}/lib ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
 endif
 endif
 
 
 KERNEL_PKGDIR:=$(LINUX_BUILD_DIR)/kernel-pkg
 KERNEL_PKGDIR:=$(LINUX_BUILD_DIR)/kernel-pkg