Mercurial > hg > graal-jvmci-8
diff make/windows/create.bat @ 8883:b9a918201d47
Merge with hsx25
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Sat, 06 Apr 2013 20:04:06 +0200 |
parents | 76841bdd5f3e 6b748c9e1845 |
children | 6cae606d563f |
line wrap: on
line diff
--- a/make/windows/create.bat Fri Apr 05 18:53:57 2013 +0200 +++ b/make/windows/create.bat Sat Apr 06 20:04:06 2013 +0200 @@ -37,10 +37,10 @@ REM that "grep" be accessible on the PATH. An MKS install does this. REM -rem cl 2>NUL >NUL -rem if %errorlevel% == 0 goto nexttest -rem echo Make sure cl.exe is in your PATH before running this script. -rem goto end +cl 2>NUL >NUL +if %errorlevel% == 0 goto nexttest +echo Make sure cl.exe is in your PATH before running this script. +goto end :nexttest grep -V 2>NUL >NUL @@ -52,8 +52,6 @@ :testit cl 2>&1 | grep "x64" >NUL if %errorlevel% == 0 goto amd64 -cl 2>&1 | grep "x64" >NUL -if %errorlevel% == 0 goto amd64 set ARCH=x86 set BUILDARCH=i486 set Platform_arch=x86 @@ -150,7 +148,7 @@ REM This is now safe to do. :copyfiles -for /D %%i in (graal, compiler1, compiler2, tiered, core, kernel) do ( +for /D %%i in (graal, compiler1, compiler2, tiered, core) do ( if NOT EXIST %HotSpotBuildSpace%\%%i\generated mkdir %HotSpotBuildSpace%\%%i\generated copy %HotSpotWorkSpace%\make\windows\projectfiles\%%i\* %HotSpotBuildSpace%\%%i\generated > NUL ) @@ -158,7 +156,7 @@ REM force regneration of ProjectFile if exist %ProjectFile% del %ProjectFile% -for /D %%i in (graal, compiler1, compiler2, tiered, core, kernel) do ( +for /D %%i in (graal, compiler1, compiler2, tiered, core) do ( echo -- %%i -- echo # Generated file! > %HotSpotBuildSpace%\%%i\local.make echo # Changing a variable below and then deleting %ProjectFile% will cause >> %HotSpotBuildSpace%\%%i\local.make