summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-07 16:01:17 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-07 16:01:17 +0100
commit0e8808034d072fcac7039f34b72654bbca53a988 (patch)
treed739672b5547abb9f136161ffd4e05c72dab09fc /mk
parentbccb7e471926219a01e6ce673d31009d5711fa53 (diff)
fix x32 musl
Diffstat (limited to 'mk')
-rw-r--r--mk/image.mk2
-rw-r--r--mk/vars.mk2
2 files changed, 1 insertions, 3 deletions
diff --git a/mk/image.mk b/mk/image.mk
index ec61ff374..e97839760 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -51,7 +51,6 @@ image-prepare-post:
-rm -f ${TARGET_DIR}/bin/sh
ln -sf ${BINSH} ${TARGET_DIR}/bin/sh
ifeq ($(ADK_LINUX_X86_64),y)
-ifneq ($(ADK_TARGET_ABI_X32),y)
# fixup lib dirs
mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH}
rm -rf ${TARGET_DIR}/lib/
@@ -61,7 +60,6 @@ ifneq ($(ADK_TARGET_ABI_X32),y)
rm -rf ${TARGET_DIR}/usr/lib/
(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
endif
-endif
ifeq ($(ADK_LINUX_PPC64),y)
# fixup lib dirs
mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH}
diff --git a/mk/vars.mk b/mk/vars.mk
index b99ba9510..c497feb9a 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -55,7 +55,7 @@ HOST_PATH= ${SCRIPT_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${
AUTOTOOL_PATH= ${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH}
ifeq ($(ADK_TARGET_ABI_X32),y)
-GNU_TARGET_NAME= $(CPU_ARCH)-x32-linux
+GNU_TARGET_NAME= $(CPU_ARCH)-x32-linux-$(ADK_TARGET_SUFFIX)
else
GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX)
endif