diff options
| author | Jeremy Koritzinsky <jekoritz@microsoft.com> | 2019-10-26 00:10:10 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-26 00:10:10 +0300 |
| commit | 4988ba25cf94e2ccddfae3ad513615b50e72005d (patch) | |
| tree | c163a5bf444e82af09cdc01d96731f7a5c148489 /src/coreclr/pgosupport.cmake | |
| parent | 9c11ac4714a5456c0e80c54864f021527236ec82 (diff) | |
Use global packages cache for local builds by default in CoreC… (dotnet/coreclr#27373)
* Get the product build to use the global package cache only.
* Move external.csproj out to the tests folder. Fix restore location so external.csproj correctly resolves its nuget-generated props/targets files.
* Fix typo.
* Fix expected failure case on platforms that don't support PGO/IBC.
* Don't error out if optimization data is not supported for the current platform.
* Fix casing that was causing the Linux x64 build to fail to find the pgo/ibc packages.
* Fix condition.
* Pass OS-Arch-Config to external test package restore.
* The platform-specific version of Microsoft.NETCore.CoreDisTools is an older version for non-Windows, so hardcode that version in stress_dependencies.csproj
Commit migrated from https://github.com/dotnet/coreclr/commit/f0887c4aea35f503dd212f0dab997f79d9f96f85
Diffstat (limited to 'src/coreclr/pgosupport.cmake')
| -rw-r--r-- | src/coreclr/pgosupport.cmake | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/coreclr/pgosupport.cmake b/src/coreclr/pgosupport.cmake index 59a03739a74..ec1b9dcb3ae 100644 --- a/src/coreclr/pgosupport.cmake +++ b/src/coreclr/pgosupport.cmake @@ -8,14 +8,9 @@ function(add_pgo TargetName) else(WIN32) set(ProfileFileName "${TargetName}.profdata") endif(WIN32) - - set(CLR_CMAKE_OPTDATA_PACKAGEWITHRID "optimization.${CLR_CMAKE_TARGET_OS}-${CLR_CMAKE_TARGET_ARCH}.PGO.CoreCLR") - - # On case-sensitive file systems, NuGet packages are restored to lowercase paths - string(TOLOWER "${CLR_CMAKE_OPTDATA_PACKAGEWITHRID}/${CLR_CMAKE_OPTDATA_VERSION}" OptDataVersionedSubPath) - + file(TO_NATIVE_PATH - "${CLR_CMAKE_PACKAGES_DIR}/${OptDataVersionedSubPath}/data/${ProfileFileName}" + "${CLR_CMAKE_OPTDATA_PATH}/data/${ProfileFileName}" ProfilePath ) |