diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-03 07:57:21 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-03 07:57:21 +0100 |
commit | 6d8a8d81525622bdc1d294f3368dbd301e6c4b3b (patch) | |
tree | 159e9dd6f46d2c6a31a59c5bb334c3a126c023a0 /mk/vars.mk | |
parent | b1792baaf8cb1686e463e98e9142ee611a14feaf (diff) | |
parent | fd41ea2ad4a1badf95559f1613318e9631b3ce52 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk/vars.mk')
-rw-r--r-- | mk/vars.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mk/vars.mk b/mk/vars.mk index ef50e59d8..3798757bc 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -49,11 +49,9 @@ TARGET_PATH= ${SCRIPT_DIR}:${STAGING_TARGET_DIR}/scripts:${STAGING_HOST_DIR}/bi HOST_PATH= ${SCRIPT_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH} AUTOTOOL_PATH= ${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH} ifeq ($(ADK_TARGET_ABI_X32),y) -REAL_GNU_TARGET_NAME= $(CPU_ARCH)-x32-linux-$(ADK_TARGET_SUFFIX) GNU_TARGET_NAME= $(CPU_ARCH)-x32-linux else -REAL_GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX) -GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux +GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX) endif ifeq ($(ADK_DISABLE_HONOUR_CFLAGS),) @@ -67,7 +65,7 @@ TARGET_CROSS:= TARGET_COMPILER_PREFIX?= CONFIGURE_TRIPLE:= else -TARGET_CROSS:= $(STAGING_HOST_DIR)/bin/$(REAL_GNU_TARGET_NAME)- +TARGET_CROSS:= $(STAGING_HOST_DIR)/bin/$(GNU_TARGET_NAME)- TARGET_COMPILER_PREFIX?=${TARGET_CROSS} CONFIGURE_TRIPLE:= --build=${GNU_HOST_NAME} --host=${GNU_TARGET_NAME} --target=${GNU_TARGET_NAME} endif |