summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-04-03 20:44:34 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-04-03 20:44:34 +0200
commit2484b250c93f9cca8e0565223a920d77ca1e571e (patch)
tree5d440cc005f2fd6768e41b661ce23ce2eb863cfd /mk
parentc994348c75f154eecb5ff48392b40c45ec80de55 (diff)
parent3fbdaa5995707a0e7398b3b78e7b7c195a143f6d (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
-rw-r--r--mk/pkg-bottom.mk5
-rw-r--r--mk/vars.mk2
2 files changed, 3 insertions, 4 deletions
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index ff7bd5638..49bae85f8 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -72,10 +72,7 @@ else ifeq ($(strip ${CONFIG_STYLE}),)
done;
cd ${WRKBUILD}; rm -f config.{cache,status}; \
env ${CONFIGURE_ENV} \
- ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \
- --build=${GNU_HOST_NAME} \
- --host=${GNU_TARGET_NAME} \
- --target=${GNU_TARGET_NAME} \
+ ${BASH} ${WRKSRC}/${CONFIGURE_PROG} ${CONFIGURE_TRIPLE} \
--program-prefix= \
--program-suffix= \
--prefix=/usr \
diff --git a/mk/vars.mk b/mk/vars.mk
index 6aad509de..d9edef6e7 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -50,9 +50,11 @@ GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux
ifeq ($(ADK_NATIVE),y)
TARGET_CROSS:=
TARGET_COMPILER_PREFIX?=
+CONFIGURE_TRIPLE:=
else
TARGET_CROSS:= $(STAGING_HOST_DIR)/bin/$(REAL_GNU_TARGET_NAME)-
TARGET_COMPILER_PREFIX?=${TARGET_CROSS}
+CONFIGURE_TRIPLE:= --build=${GNU_HOST_NAME} --host=${GNU_TARGET_NAME} --target=${GNU_TARGET_NAME}
endif
ifneq ($(strip ${ADK_USE_CCACHE}),)