[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-311-gba19fa2

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  ba19fa24d1c81638abb27840d2f8144fa2315511 (commit)
      from  22f6eb050e41e0d8de86f18f5b8b8bd1932a937f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ba19fa24d1c81638abb27840d2f8144fa2315511
Author: Julien Boibessot <jul...@ar...>
Date:   Sun Jun 29 23:04:58 2014 +0200

    [BUILD] Fixes build informations when BR2_HOST_DIR is not set to default value

-----------------------------------------------------------------------

Summary of changes:
 Makefile.in |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 85b440c..bc67917 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,6 +9,7 @@ ARMADEUS_BASE_DIR:=$(shell pwd)
 endif
 
 BUILDROOT_DIR:=$(ARMADEUS_BASE_DIR)/buildroot
+BASE_DIR := $(ARMADEUS_BASE_DIR)/buildroot/output
 
 ifneq ($(BUILDROOT_DL_DIR),)
 # To be removed with BR 2014.02
@@ -71,6 +72,11 @@ BUILDROOT_OUTPUT_DIR:=$(BUILDROOT_DIR)/output
 BUILDROOT_PROJECT_BUILD_DIR:=$(BUILDROOT_OUTPUT_DIR)/build
 BUILDROOT_TOOLCHAIN_BUILD_DIR:=$(BUILDROOT_OUTPUT_DIR)/toolchain
 BUILDROOT_BUILD_DIR:=$(BUILDROOT_OUTPUT_DIR)/build
+ifneq ($(BR2_HOST_DIR),)
+BUILDROOT_HOST_DIR:=$(shell echo $(BR2_HOST_DIR))
+else
+BUILDROOT_HOST_DIR:=$(BUILDROOT_DIR)/output/host
+endif
 ARMADEUS_BINARIES:=$(BUILDROOT_OUTPUT_DIR)/images
 ARMADEUS_ROOTFS_DIR:=$(BUILDROOT_OUTPUT_DIR)/target
 ARMADEUS_ROOTFS_TAR:=$(ARMADEUS_BINARIES)/$(ARMADEUS_BOARD_NAME)-rootfs.tar
@@ -83,7 +89,7 @@ ARMADEUS_BOARD_DIR:=$(BUILDROOT_DIR)/target/device/armadeus/$(ARMADEUS_BOARD_NAM
 ARMADEUS_LINUX_CONFIG:=$(ARMADEUS_BOARD_DIR)/$(ARMADEUS_BOARD_NAME)-linux-$(ARMADEUS_LINUX_MAIN_VERSION).config
 ARMADEUS_U_BOOT_CONFIG:=$(BUILDROOT_DIR)/$(shell echo $(BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE))
 ARMADEUS_STAGING_DIR:=$(BUILDROOT_OUTPUT_DIR)/staging
-ARMADEUS_TOOLCHAIN_PATH:=$(BUILDROOT_OUTPUT_DIR)/host/usr/bin
+ARMADEUS_TOOLCHAIN_PATH:=$(BUILDROOT_HOST_DIR)/usr/bin
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
 ARMADEUS_GCC_VERSION=$(shell $(ARMADEUS_TOOLCHAIN_PATH)/$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)-gcc -dumpversion)
 else


hooks/post-receive
-- 
armadeus