--- build.sh	2008-05-20 14:13:02.000000000 -0600
+++ build.sh	2008-05-20 14:15:15.000000000 -0600
@@ -215,7 +215,7 @@
     cc)
     if test -z "$CC" ; then CC=cc ; fi
     BOOST_JAM_CC=$CC
-    BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LIBS"
+    BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM         $LIBS"
     BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LIBS"
     BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LIBS"
     ;;
@@ -287,6 +287,7 @@
     echo_run ${BOOST_JAM_CC} ${BOOST_JAM_OPT_JAM} ${BJAM_SOURCES}
 fi
 if test -x "./bootstrap/jam0" ; then
+    BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAMBASE $CFLAGS $LIBS"
     if test "${BJAM_UPDATE}" != "update" ; then
         echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" clean
     fi