From 3c34ba9a86e4f0f3083dbc6791ed85719b57eec0 Mon Sep 17 00:00:00 2001
From: Christoph Niethammer <niethammer@hlrs.de>
Date: Thu, 31 Mar 2011 10:47:30 +0000
Subject: [PATCH] Enable instrumentation per default; generate logfiles;
 parallel build.

---
 mcxx-nanox_install.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/mcxx-nanox_install.sh b/mcxx-nanox_install.sh
index 1f89818..2fcf22e 100755
--- a/mcxx-nanox_install.sh
+++ b/mcxx-nanox_install.sh
@@ -19,6 +19,8 @@ COMPILER=${COMPILER:=gnu}
 # use specific compiler version
 COMPILER_VERSION=${COMPILER_VERSION:=}
 
+MAKEOPTS="-j3"
+
 # package to build
 CATEGORY="compiler"
 PACKAGE="mcxx-nanox"
@@ -32,7 +34,7 @@ mcxx_src_dir="$SRC_POOL/mcxx/mcxx.git"
 nanox_src_dir="$SRC_POOL/nanox/nanox.git"
 
 # enable instrumentation (no|yes)
-instrumentation=${instrumentation:="no"}
+instrumentation=${instrumentation:="yes"}
 
 # Compiler specifications
 
@@ -99,11 +101,12 @@ make_package ()
     fi
     mkdir build
     cd build
-    ../configure --prefix=$PREFIX $* || fail
+    ../configure --prefix=$PREFIX $* 2>&1 | tee "configure.log";  ( exit ${PIPESTATUS} )
     echo -n "compiling... "
-    make || fail
+    make $MAKEOPTS  2>&1 | tee "make.log";  ( exit ${PIPESTATUS} )
     echo -n "installing... "
-    make install || fail
+    make install  2>&1 | tee "make_install.log";  ( exit ${PIPESTATUS} )
+    bzip2 *.log
     cd ..
     echo "Success"
 }