diff options
| author | Jeremy Koritzinsky <jekoritz@microsoft.com> | 2019-05-03 17:56:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-03 17:56:20 -0700 |
| commit | 1ffcf98bc8fceff36b52cd97f9228af4a3748f08 (patch) | |
| tree | 2d70714a2a4f5a3dd56aec4eb52866b1669e93de /src/pal/tools | |
| parent | a64d7a8aa558773bd57bafbbf91d5294de59ad5d (diff) | |
| download | coreclr-1ffcf98bc8fceff36b52cd97f9228af4a3748f08.tar.gz coreclr-1ffcf98bc8fceff36b52cd97f9228af4a3748f08.tar.bz2 coreclr-1ffcf98bc8fceff36b52cd97f9228af4a3748f08.zip | |
Use our local-built instances of tools from Microsoft.DotNet.BuildTools.CoreClr instead of using the package. (#24347)
* Use our local-built instances of tools from Microsoft.DotNet.BuildTools.CoreClr instead of using the package.
* Fix const-correctness in InjectResource.
* Build cross-arch native components before building native components for target arch.
* Build InjectResource and GenClrDebugResource for the host arch when cross-building and import the targets into the cross-build.
* install(EXPORT) in the directory where the target is created
Diffstat (limited to 'src/pal/tools')
| -rw-r--r-- | src/pal/tools/gen-buildsys-win.bat | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pal/tools/gen-buildsys-win.bat b/src/pal/tools/gen-buildsys-win.bat index 234c0cbfc6..a3df018d06 100644 --- a/src/pal/tools/gen-buildsys-win.bat +++ b/src/pal/tools/gen-buildsys-win.bat @@ -45,7 +45,7 @@ if defined CMakePath goto DoGen for /f "delims=" %%a in ('powershell -NoProfile -ExecutionPolicy ByPass "& "%basePath%\set-cmake-path.ps1""') do %%a :DoGen -"%CMakePath%" "-DCMAKE_USER_MAKE_RULES_OVERRIDE=%basePath%\windows-compiler-override.txt" "-DCMAKE_INSTALL_PREFIX:PATH=$ENV{__CMakeBinDir}" "-DCLR_CMAKE_HOST_ARCH=%__Arch%" %__ExtraCmakeParams% -G "%__CmakeGenerator%" %__SourceDir% +"%CMakePath%" "-DCMAKE_USER_MAKE_RULES_OVERRIDE=%basePath%\windows-compiler-override.txt" "-DCMAKE_INSTALL_PREFIX=%__CMakeBinDir%" "-DCLR_CMAKE_HOST_ARCH=%__Arch%" %__ExtraCmakeParams% -G "%__CmakeGenerator%" %__SourceDir% endlocal GOTO :DONE |