diff -r c9999128b263 -r c53746e72ad1 PCbuild/build.bat
--- a/PCbuild/build.bat	Thu Jul 17 19:00:30 2014 +0100
+++ b/PCbuild/build.bat	Wed May 14 11:24:58 2014 +0300
@@ -22,7 +22,7 @@
 if "%1"=="-d" (set conf=Debug) & shift & goto CheckOpts
 if "%1"=="-e" call "%dir%get_externals.bat" & shift & goto CheckOpts
 
-if "%platf%"=="x64" (set vs_platf=amd64)
+if "%platf%"=="x64" (set vs_platf=x86_amd64)
 
 rem Setup the environment
 call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" %vs_platf%
diff -r c9999128b263 -r c53746e72ad1 PCbuild/build_pgo.bat
--- a/PCbuild/build_pgo.bat	Thu Jul 17 19:00:30 2014 +0100
+++ b/PCbuild/build_pgo.bat	Wed May 14 11:24:58 2014 +0300
@@ -7,15 +7,14 @@
 
 setlocal
 set platf=Win32
-set dir=%~dp0
 
 rem use the performance testsuite.  This is quick and simple
-set job1="%dir%..\tools\pybench\pybench.py" -n 1 -C 1 --with-gc
-set path1="%dir%..\tools\pybench"
+set job1=%~dp0..\tools\pybench\pybench.py -n 1 -C 1 --with-gc
+set path1=%~dp0..\tools\pybench
 
 rem or the whole testsuite for more thorough testing
-set job2="%dir%..\lib\test\regrtest.py"
-set path2="%dir%..\lib"
+set job2=%~dp0..\lib\test\regrtest.py
+set path2=%~dp0..\lib
 
 set job=%job1%
 set clrpath=%path1%
@@ -24,23 +23,19 @@
 if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts
 if "%1"=="-2" (set job=%job2%) & (set clrpath=%path2%) & shift & goto CheckOpts
 
-set PGI=%dir%%platf%-pgi
-set PGO=%dir%%platf%-pgo
+set PGI=%platf%-pgi
+set PGO=%platf%-pgo
 
 @echo on
 rem build the instrumented version
-call "%dir%build" -p %platf% -c PGInstrument
-
-if "%platf%"=="x64" (set vs_platf=amd64)
-rem Setup the environment
-call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" %vs_platf%
+call build -p %platf% -c PGInstrument
 
 rem remove .pyc files, .pgc files and execute the job
-"%PGI%\python.exe" "%dir%rmpyc.py" %clrpath%
-del "%PGI%\*.pgc"
-"%PGI%\python.exe" %job%
+%PGI%\python.exe rmpyc.py "%clrpath%"
+del %PGI%\*.pgc
+%PGI%\python.exe "%job%"
 
 rem finally build the optimized version
-if exist "%PGO%" del /s /q "%PGO%"
-call "%dir%build" -p %platf% -c PGUpdate
+if exist %PGO% del /s /q %PGO%
+call build -p %platf% -c PGUpdate