partial commit to merge database

lib/spack/env/cc

@@ -89,19 +89,23 @@ done
 command=$(basename "$0")
 case "$command" in
     cc|gcc|c89|c99|clang|xlc)
-        command="$SPACK_CC $SPACK_CFLAGS"
+        command="$SPACK_CC"
+#        command="$SPACK_CC $SPACK_CFLAGS"
         language="C"
         ;;
     c++|CC|g++|clang++|xlC)
-        command="$SPACK_CXX SPACK_CXXFLAGS"
+        command="$SPACK_CXX"
+#        command="$SPACK_CXX SPACK_CXXFLAGS"
         language="C++"
         ;;
     f77|xlf)
-        command="$SPACK_F77 $SPACK_FFLAGS"
+        command="$SPACK_F77"
+#        command="$SPACK_F77 $SPACK_FFLAGS"
         language="Fortran 77"
         ;;
     fc|f90|f95|xlf90)
-        command="$SPACK_FC $SPACK_FFLAGS"
+        command="$SPACK_FC"
+#        command="$SPACK_FC $SPACK_FFLAGS"
         language="Fortran 90"
         ;;
     cpp)
@@ -109,7 +113,7 @@ case "$command" in
         ;;
     ld)
         mode=ld
-        command+=" $LDFLAGS"
+ #       command+=" $LDFLAGS"
         ;;
     *)
         die "Unkown compiler: $command"
@@ -119,7 +123,7 @@ esac
 # Finish setting up the mode.
 if [ -z "$mode" ]; then
     mode=ccld
-    command+=" $SPACK_LDFLAGS"
+#    command+=" $SPACK_LDFLAGS"
     for arg in "$@"; do
         if [ "$arg" = -v -o "$arg" = -V -o "$arg" = --version -o "$arg" = -dumpversion ]; then
             mode=vcheck