[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2517-g18c94ef

[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  18c94eff1a9880a70846c77b0cbb3447bb008809 (commit)
      from  77562d8db1711b268e1b614714e9122b91cb3110 (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 18c94eff1a9880a70846c77b0cbb3447bb008809
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Sep 30 11:07:49 2011 +0200

    [TEST] Fixes testsuite build to work with external toolchains too

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

Summary of changes:
 buildroot/package/armadeus/testsuite/testsuite.mk  |    2 +-
 .../fpga/virtual_components/button/Makefile        |   12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/buildroot/package/armadeus/testsuite/testsuite.mk b/buildroot/package/armadeus/testsuite/testsuite.mk
index 90575a2..8426150 100644
--- a/buildroot/package/armadeus/testsuite/testsuite.mk
+++ b/buildroot/package/armadeus/testsuite/testsuite.mk
@@ -20,7 +20,7 @@ $(ARMADEUS-TESTSUITE_DIR)/.unpacked:
 
 $(ARMADEUS-TESTSUITE_TARGET_BINARY): $(ARMADEUS-TESTSUITE_DIR)/.unpacked
 	$(ARMADEUS-TESTSUITE_SOURCE)/install.sh $(ARMADEUS-TESTSUITE_TARGET_DIR)
-	make -C $(ARMADEUS-TESTSUITE_WISHBONE_BUTTON_DIR) test
+	make -C $(ARMADEUS-TESTSUITE_WISHBONE_BUTTON_DIR) CC="$(TARGET_CC)" test
 	install -D $(ARMADEUS-TESTSUITE_WISHBONE_BUTTON_DIR)/testbutton $(ARMADEUS-TESTSUITE_TARGET_DIR)
 	touch $@
 
diff --git a/target/linux/modules/fpga/virtual_components/button/Makefile b/target/linux/modules/fpga/virtual_components/button/Makefile
index 2df8d7f..bb42489 100755
--- a/target/linux/modules/fpga/virtual_components/button/Makefile
+++ b/target/linux/modules/fpga/virtual_components/button/Makefile
@@ -2,17 +2,25 @@
 # Makefile for the Armadeus FPGA button driver
 #
 
+ifneq ($(KERNELRELEASE),)
+# Part executed when called from kernel build system:
+
 obj-$(CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_BUTTON)	+= button_ocore.o
 button_ocore-objs := gbutton.o
 
+else
+# Part executed when called from standard make in this directory:
+# (preferably use Makefile in parent directory)
+
 ARMADEUS_BASE_DIR=../../../../../..
 -include $(ARMADEUS_BASE_DIR)/Makefile.in
 
+CC = $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
 KDIR := $(ARMADEUS_LINUX_DIR)
 PWD  := $(shell pwd)
 
 test:
-	$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc -Wall testbutton.c -o testbutton
+	$(CC) -Wall testbutton.c -o testbutton
 	chmod 755 testbutton
 
-
+endif


hooks/post-receive
-- 
armadeus