no color output, thanks Mac; better callback to real make

Change-Id: Iff2a15ed8aad28c264209b26a33d1206ec80b794

envsetup.sh

@@ -1,4 +1,3 @@
-MAKE_UTIL=(`which make`)
 function hmm() {
 cat <<EOF
 Invoke ". build/envsetup.sh" from your shell to add the following functions to your environment:
@@ -37,7 +36,7 @@ function get_abs_build_var()
         return
     fi
     (\cd $T; CALLED_FROM_SETUP=true BUILD_SYSTEM=build/core \
-      $MAKE_UTIL --no-print-directory -f build/core/config.mk dumpvar-abs-$1)
+      command make --no-print-directory -f build/core/config.mk dumpvar-abs-$1)
 }
 
 # Get the exact value of a build variable.
@@ -49,7 +48,7 @@ function get_build_var()
         return
     fi
     (\cd $T; CALLED_FROM_SETUP=true BUILD_SYSTEM=build/core \
-      $MAKE_UTIL --no-print-directory -f build/core/config.mk dumpvar-$1)
+      command make --no-print-directory -f build/core/config.mk dumpvar-$1)
 }
 
 # check to see if the supplied product is one we can build
@@ -1481,7 +1480,7 @@ function pez {
 function make()
 {
     local start_time=$(date +"%s")
-    $MAKE_UTIL $@
+    command make $@
     local ret=$?
     local end_time=$(date +"%s")
     local tdiff=$(($end_time-$start_time))
@@ -1490,9 +1489,9 @@ function make()
     local secs=$(($tdiff % 60))
     echo
     if [ $ret -eq 0 ] ; then
-        echo -n -e "\e[0;32m#### make completed successfully "
+        echo -n -e "#### make completed successfully "
     else
-        echo -n -e "\e[0;31m#### make failed to build some targets "
+        echo -n -e "#### make failed to build some targets "
     fi
     if [ $hours -gt 0 ] ; then
         printf "(%02g:%02g:%02g (hh:mm:ss))" $hours $mins $secs
@@ -1501,7 +1500,7 @@ function make()
     elif [ $secs -gt 0 ] ; then
         printf "(%s seconds)" $secs
     fi
-    echo -e " ####\e[00m"
+    echo -e " ####"
     echo
     return $ret
 }