llvm: Fix OPTFLAGS.

Change-Id: Id35ac2821ad69825735c50a32bdd04d8453edb22

diff --git a/minix/llvm/build.llvm b/minix/llvm/build.llvm
index c3b7eb5d9e6123ab9126de25a60ec0a287381af2..913a3114ad79279ed6c9200097744b5369536c8e 100755 (executable)
--- a/minix/llvm/build.llvm
+++ b/minix/llvm/build.llvm
@@ -140,9 +140,11 @@ echo
 
 cd ${MINIX_ROOT}
 
+OPTFLAGS=`echo ${OPTFLAGS} | sed -e 's/\\$/$$/g'`
 for m in ${MINIX_MODS}
 do 
        echo "Instrumenting $m ..."
+
        n=`get_module_name $m`
        if [ "" == "$n" ]; then
                 echo "Error: Couldn't fetch the module name for $m"
@@ -153,12 +155,11 @@ do
                continue
        fi
        clean_module $n $m
-       OPTFLAGS=`echo ${OPTFLAGS} | sed -e "s/\ /\\\ /g"`
-       OPTFLAGS_PLACEHOLDER="OPTFLAGS.$n=${OPTFLAGS}"
-       
-       (env "`echo ${OPTFLAGS_PLACEHOLDER}`" MKBITCODE=yes \
-       ${TOOLDIR}/nbmake-${ARCH} -C $m all install && echo "INFO: $m successfully instrumented." ) || echo "ERROR: Failed instrumenting $m"
-       echo 
+
+       ( ${TOOLDIR}/nbmake-${ARCH} -C $m all install MKBITCODE=yes OPTFLAGS.$n="${OPTFLAGS}" \
+           && echo "INFO: $m successfully instrumented."
+       )
+       echo
 done
 
 cd ${MYPWD}