Index: build.bat
===================================================================
--- build.bat	(revision 47366)
+++ build.bat	(working copy)
@@ -202,11 +202,11 @@
 REM If no arguments guess the toolset;
 REM or if first argument is an option guess the toolset;
 REM otherwise the argument is the toolset to use.
-if "_%1_" == "__" (
+if "_%~1_" == "__" (
     call :Guess_Toolset
     if not errorlevel 1 goto Setup_Toolset
 ) else (
-    call :Test_Option "%1"
+    call :Test_Option "%~1"
     if not errorlevel 1 (
         call :Guess_Toolset
         if not errorlevel 1 goto Setup_Toolset
@@ -230,8 +230,8 @@
 REM command. A complete "if ... ( commands ) else ( commands )"
 REM is a single command, even though it's in multiple lines here.
 :Setup_Args
-if "_%1_" == "__" goto Config_Toolset
-call :Test_Option "%1"
+if "_%~1_" == "__" goto Config_Toolset
+call :Test_Option "%~1"
 if errorlevel 1 (
     set BOOST_JAM_ARGS=%BOOST_JAM_ARGS% %1
     shift
@@ -384,16 +384,16 @@
 set BJAM_SOURCES=%BJAM_SOURCES% modules/property-set.c modules/sequence.c modules/order.c
 
 set BJAM_UPDATE=
-if "_%1" == "_--update" (
+if "_%~1" == "_--update" (
     set BJAM_UPDATE=update
 )
-if "_%2" == "_--update" (
+if "_%~2" == "_--update" (
     set BJAM_UPDATE=update
 )
-if "_%3" == "_--update" (
+if "_%~3" == "_--update" (
     set BJAM_UPDATE=update
 )
-if "_%4" == "_--update" (
+if "_%~4" == "_--update" (
     set BJAM_UPDATE=update
 )
 if "_%BJAM_UPDATE%_" == "_update_" (
@@ -446,7 +446,7 @@
 :Skip_Clean
 @set args=
 :Set_Args
-@if not "_%1_" == "__" (
+@if not "_%~1_" == "__" (
     set args=%args% %1
     shift
     goto Set_Args