From 4316f1cd31afd18e35b5ebd9852a156d2c68c8df Mon Sep 17 00:00:00 2001
From: Massimiliano Culpo <massimiliano.culpo@googlemail.com>
Date: Tue, 23 Feb 2016 16:57:19 +0100
Subject: Modified wrapper to have a different behavior when modeis vcheck

---
 lib/spack/env/cc | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/spack/env/cc b/lib/spack/env/cc
index aacba996b3..dfb0801c56 100755
--- a/lib/spack/env/cc
+++ b/lib/spack/env/cc
@@ -113,14 +113,22 @@ case "$command" in
         ;;
 esac
 
-# Finish setting up the mode.
+# If any of the arguments below is present then the mode is vcheck. In vcheck mode nothing is added in terms of extra search paths or libraries
 if [ -z "$mode" ]; then
-    mode=ccld
     for arg in "$@"; do
         if [ "$arg" = -v -o "$arg" = -V -o "$arg" = --version -o "$arg" = -dumpversion ]; then
             mode=vcheck
             break
-        elif [ "$arg" = -E ]; then
+	fi
+    done
+fi
+
+# Finish setting up the mode.
+
+if [ -z "$mode" ]; then
+    mode=ccld
+    for arg in "$@"; do
+        if [ "$arg" = -E ]; then
             mode=cpp
             break
         elif [ "$arg" = -c ]; then
@@ -145,6 +153,11 @@ fi
 # Save original command for debug logging
 input_command="$@"
 
+if [ "$mode" == vcheck ] ; then
+    exec "${input_command}"
+    exit
+fi
+
 #
 # Now do real parsing of the command line args, trying hard to keep
 # non-rpath linker arguments in the proper order w.r.t. other command
@@ -330,3 +343,5 @@ if [ "$SPACK_DEBUG" = "TRUE" ]; then
 fi
 
 exec "${full_command[@]}"
+
+
-- 
cgit v1.2.3-70-g09d2


From 5ce97eeda52944128dc32c0d7728550d95520b0d Mon Sep 17 00:00:00 2001
From: alalazo <massimiliano.culpo@googlemail.com>
Date: Wed, 24 Feb 2016 09:17:04 +0100
Subject: intel : polished code

---
 lib/spack/env/cc | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'lib')

diff --git a/lib/spack/env/cc b/lib/spack/env/cc
index dfb0801c56..644d2be1d6 100755
--- a/lib/spack/env/cc
+++ b/lib/spack/env/cc
@@ -155,7 +155,6 @@ input_command="$@"
 
 if [ "$mode" == vcheck ] ; then
     exec "${input_command}"
-    exit
 fi
 
 #
@@ -343,5 +342,3 @@ if [ "$SPACK_DEBUG" = "TRUE" ]; then
 fi
 
 exec "${full_command[@]}"
-
-
-- 
cgit v1.2.3-70-g09d2


From 7ae6c62ddb0271d9e2364cf4249adbc7abbc0b31 Mon Sep 17 00:00:00 2001
From: Massimiliano Culpo <massimiliano.culpo@googlemail.com>
Date: Thu, 10 Mar 2016 14:08:43 +0100
Subject: Fixed shell quoting error

---
 lib/spack/env/cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/spack/env/cc b/lib/spack/env/cc
index 6b6073db43..2888c28c48 100755
--- a/lib/spack/env/cc
+++ b/lib/spack/env/cc
@@ -154,7 +154,7 @@ fi
 input_command="$@"
 
 if [ "$mode" == vcheck ] ; then
-    exec "${input_command}"
+    exec ${command} ${input_command}
 fi
 
 #
-- 
cgit v1.2.3-70-g09d2


From 78ef0618bc6d60f50edc6bb83b5cb1a5a48ac22b Mon Sep 17 00:00:00 2001
From: alalazo <massimiliano.culpo@googlemail.com>
Date: Thu, 10 Mar 2016 14:35:09 +0100
Subject: cc : converted indents to spaces

---
 lib/spack/env/cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/spack/env/cc b/lib/spack/env/cc
index 2888c28c48..3e429fdf22 100755
--- a/lib/spack/env/cc
+++ b/lib/spack/env/cc
@@ -119,7 +119,7 @@ if [ -z "$mode" ]; then
         if [ "$arg" = -v -o "$arg" = -V -o "$arg" = --version -o "$arg" = -dumpversion ]; then
             mode=vcheck
             break
-	fi
+    fi
     done
 fi
 
-- 
cgit v1.2.3-70-g09d2


From 30adc4c9b8cdbe099ebe4ef9bec4b2594cda7b61 Mon Sep 17 00:00:00 2001
From: alalazo <massimiliano.culpo@googlemail.com>
Date: Thu, 10 Mar 2016 14:59:31 +0100
Subject: cc : handle spaces in folders?

---
 lib/spack/env/cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/spack/env/cc b/lib/spack/env/cc
index 3e429fdf22..4a3e6eddc9 100755
--- a/lib/spack/env/cc
+++ b/lib/spack/env/cc
@@ -154,7 +154,7 @@ fi
 input_command="$@"
 
 if [ "$mode" == vcheck ] ; then
-    exec ${command} ${input_command}
+    exec ${command} "$@"
 fi
 
 #
-- 
cgit v1.2.3-70-g09d2