diff options
| author | Rahul Kumar <rahku@microsoft.com> | 2016-04-12 14:40:23 -0700 |
|---|---|---|
| committer | Rahul Kumar <rahku@microsoft.com> | 2016-04-18 22:17:29 -0700 |
| commit | 7f46dbe0c6b0785a4e40978da684b1dc81d0b8ce (patch) | |
| tree | 2de78686eb771e11d7276c69791405550bbd0311 /src/pal/tools | |
| parent | 0a31fe90800bd45e3c3668483dbe27358864170e (diff) | |
| download | coreclr-7f46dbe0c6b0785a4e40978da684b1dc81d0b8ce.tar.gz coreclr-7f46dbe0c6b0785a4e40978da684b1dc81d0b8ce.tar.bz2 coreclr-7f46dbe0c6b0785a4e40978da684b1dc81d0b8ce.zip | |
enable build of cross target components.
Currently only enabled for arm64
Diffstat (limited to 'src/pal/tools')
| -rw-r--r-- | src/pal/tools/gen-buildsys-win.bat | 8 | ||||
| -rw-r--r-- | src/pal/tools/windows-compiler-override.txt | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/pal/tools/gen-buildsys-win.bat b/src/pal/tools/gen-buildsys-win.bat index cccd342b79..5592fe5930 100644 --- a/src/pal/tools/gen-buildsys-win.bat +++ b/src/pal/tools/gen-buildsys-win.bat @@ -1,4 +1,4 @@ -@echo off +@if not defined __echo @echo off rem rem This file invokes cmake and generates the build system for windows. @@ -26,13 +26,13 @@ set __BuildJit32=%4 if defined CMakePath goto DoGen :: Eval the output from probe-win1.ps1 -for /f "delims=" %%a in ('powershell -NoProfile -ExecutionPolicy RemoteSigned "& .\probe-win.ps1"') do %%a +for /f "delims=" %%a in ('powershell -NoProfile -ExecutionPolicy RemoteSigned "& "%basePath%\probe-win.ps1""') do %%a :DoGen if "%UseVS%" == "0" ( - "%CMakePath%" "-DCMAKE_USER_MAKE_RULES_OVERRIDE=%basePath%\windows-compiler-override.txt" "-DCLR_CMAKE_TARGET_ARCH=%3" -G "Visual Studio %__VSString% Win64" %1 + "%CMakePath%" "-DCMAKE_USER_MAKE_RULES_OVERRIDE=%basePath%\windows-compiler-override.txt" "-DCMAKE_INSTALL_PREFIX:PATH=$ENV{__CMakeBinDir}" "-DCLR_CMAKE_HOST_ARCH=%3" -G "Visual Studio %__VSString% Win64" %1 ) else ( - "%CMakePath%" "-DCMAKE_USER_MAKE_RULES_OVERRIDE=%basePath%\windows-compiler-override.txt" "-DCLR_CMAKE_TARGET_ARCH=%3" %__BuildJit32% -G "Visual Studio %__VSString%" %1 + "%CMakePath%" "-DCMAKE_USER_MAKE_RULES_OVERRIDE=%basePath%\windows-compiler-override.txt" "-DCMAKE_INSTALL_PREFIX:PATH=$ENV{__CMakeBinDir}" "-DCLR_CMAKE_HOST_ARCH=%3" %__BuildJit32% -G "Visual Studio %__VSString%" %1 ) endlocal GOTO :DONE diff --git a/src/pal/tools/windows-compiler-override.txt b/src/pal/tools/windows-compiler-override.txt index 7f3c63c24e..f6cb16856c 100644 --- a/src/pal/tools/windows-compiler-override.txt +++ b/src/pal/tools/windows-compiler-override.txt @@ -13,5 +13,4 @@ SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/O2 /Zi") SET (CLR_DEFINES_DEBUG_INIT DEBUG _DEBUG _DBG URTBLDENV_FRIENDLY=Checked BUILDENV_CHECKED=1) SET (CLR_DEFINES_CHECKED_INIT DEBUG _DEBUG _DBG URTBLDENV_FRIENDLY=Checked BUILDENV_CHECKED=1) SET (CLR_DEFINES_RELEASE_INIT NDEBUG URTBLDENV_FRIENDLY=Retail) -SET (CLR_DEFINES_RELWITHDEBINFO_INIT NDEBUG URTBLDENV_FRIENDLY=Retail) -SET (CMAKE_INSTALL_PREFIX $ENV{__CMakeBinDir}) +SET (CLR_DEFINES_RELWITHDEBINFO_INIT NDEBUG URTBLDENV_FRIENDLY=Retail)
\ No newline at end of file |