From b21c1d468d0e01e45927bbca4b00d3809714a7b0 Mon Sep 17 00:00:00 2001
From: Christian Prochaska <christian.prochaska@genode-labs.com>
Date: Wed, 28 Nov 2012 14:05:11 +0100
Subject: [PATCH] Noux tool chain run script improvements

- print status messages
- limit run script execution to the 'foc_x86_32' platform

Fixes #539.
---
 ports/run/noux_tool_chain.inc      |  8 ++++++--
 ports/run/noux_tool_chain_foc.run  | 11 +++++++++--
 ports/run/noux_tool_chain_nova.run |  5 +++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/ports/run/noux_tool_chain.inc b/ports/run/noux_tool_chain.inc
index 9d57e8030..3d5d1425b 100644
--- a/ports/run/noux_tool_chain.inc
+++ b/ports/run/noux_tool_chain.inc
@@ -146,13 +146,17 @@ append config {
 							cp /bin/make /usr/bin/
 							cp /bin/echo /usr/bin/
 							cp /bin/mkdir /usr/bin/
+							echo "creating build directory..."
 }
 append config "						/genode/tool/create_builddir $platform BUILD_DIR=/home/build"
 append config {
 							cd /home/build
-							echo "CROSS_DEV_PREFIX=genode-x86-" > etc/tools.conf }
+}
+append config "						echo \"CROSS_DEV_PREFIX=$tool_prefix\" > etc/tools.conf"
 append config "                                         $platform_cmds"
-append config {					</inline>
+append config {
+							echo "now you can type, for example, \"make core\""
+						</inline>
 					</dir>
 				</dir>
 				<dir name="tmp" />
diff --git a/ports/run/noux_tool_chain_foc.run b/ports/run/noux_tool_chain_foc.run
index d18907397..f83017aea 100644
--- a/ports/run/noux_tool_chain_foc.run
+++ b/ports/run/noux_tool_chain_foc.run
@@ -4,8 +4,8 @@
 # \date   2012-11-26
 #
 
-if {![have_spec foc]} {
-        puts "\nThis run script is only supported on Fiasco.OC\n"
+if {![have_spec foc_x86_32]} {
+        puts "\nThis run script is currently only supported on the 'foc_x86_32' target platform\n"
         exit 0
 }
 
@@ -13,7 +13,14 @@ if {![have_spec foc]} {
 build core
 exec tar cfv bin/l4.tar -h --exclude=std_tmpl include l4
 
+if {[have_spec x86_32]} {
 set platform          "foc_x86_32"
+}
+
+if {[have_spec x86_64]} {
+set platform          "foc_x86_64"
+}
+
 set platform_base_dir "base-foc"
 set platform_pkgs     "l4"
 set platform_cmds {
diff --git a/ports/run/noux_tool_chain_nova.run b/ports/run/noux_tool_chain_nova.run
index 184d2ee00..d3fd5ee21 100644
--- a/ports/run/noux_tool_chain_nova.run
+++ b/ports/run/noux_tool_chain_nova.run
@@ -4,6 +4,11 @@
 # \date   2012-11-26
 #
 
+if {![have_spec foc_x86_32]} {
+        puts "\nThis run script is currently only supported on the 'foc_x86_32' target platform\n"
+        exit 0
+}
+
 set platform          "nova_x86_32"
 set platform_base_dir "base-nova"
 set platform_pkgs     ""