by->from, the

Signed-off-by: Harmen Stoppels <me@harmenstoppels.nl>

Author: haampie

cc.sh

@@ -201,13 +201,13 @@ if eval "[ \"\${*#*${lsep}}\" != \"\$*\" ]"; then
     die "Compiler command line contains our separator ('${lsep}'). Cannot parse."
 fi
 
-# ensure required variables are set (POSIX 2.6.2 ${parameter:?word})
-: "${SPACK_COMPILER_WRAPPER_PATH:?Error: compiler wrapper must be invoked by Spack}"
-: "${SPACK_DEBUG_LOG_DIR:?Error: compiler wrapper must be invoked by Spack}"
-: "${SPACK_DEBUG_LOG_ID:?Error: compiler wrapper must be invoked by Spack}"
-: "${SPACK_SHORT_SPEC:?Error: compiler wrapper must be invoked by Spack}"
-: "${SPACK_SYSTEM_DIRS:?Error: compiler wrapper must be invoked by Spack}"
-: "${SPACK_MANAGED_DIRS:?Error: compiler wrapper must be invoked by Spack}"
+# Ensure required variables are set
+: "${SPACK_COMPILER_WRAPPER_PATH:?Error: the compiler wrapper must be invoked from Spack}"
+: "${SPACK_DEBUG_LOG_DIR:?Error: the compiler wrapper must be invoked from Spack}"
+: "${SPACK_DEBUG_LOG_ID:?Error: the compiler wrapper must be invoked from Spack}"
+: "${SPACK_SHORT_SPEC:?Error: the compiler wrapper must be invoked from Spack}"
+: "${SPACK_SYSTEM_DIRS:?Error: the compiler wrapper must be invoked from Spack}"
+: "${SPACK_MANAGED_DIRS:?Error: the compiler wrapper must be invoked from Spack}"
 
 # eval this because SPACK_MANAGED_DIRS and SPACK_SYSTEM_DIRS are inputs we don't wanna loop over.
 # moving the eval inside the function would eval it every call.

test/run.sh

@@ -358,8 +358,8 @@ test_no_wrapper_environment() {
         fail "cc with no env unexpectedly exited 0"
     fi
     case "$_out" in
-        *"compiler wrapper must be invoked by Spack"*) ;;
-        *) fail "expected 'compiler wrapper must be invoked by Spack' in: $_out" ;;
+        *"compiler wrapper must be invoked from Spack"*) ;;
+        *) fail "expected 'compiler wrapper must be invoked from Spack' in: $_out" ;;
     esac
 }