Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix -cmakeargs options to build.sh (#70901)
PR #67108 (commit 7d562f9) tried to unify how -cmakeargs is passed to build.sh and build.cmd. That commit has modified src/coreclr/runtime.proj to always include an additional -cmakeargs argument. However, on Linux, the main ./build.sh command already includes one. That results in an additional -cmakeargs argument, which makes the build fail. Fix that by making build.sh do what build.cmd does: not add the additional -cmakeargs argument. Without this change: $ ./build.sh -cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE ... Commencing CoreCLR Repo build __DistroRid: linux-x64 Setting up directories for build Checking prerequisites... Commencing build of "install" target in "CoreCLR component" for Linux.x64.Debug in runtime/artifacts/obj/coreclr/Linux.x64.Debug Invoking "runtime/eng/native/gen-buildsys.sh" "runtime/src/coreclr" "runtime/artifacts/obj/coreclr/Linux.x64.Debug" x64 clang Debug "" -DCLR_CMAKE_PGO_INSTRUMENT=0 -DCLR_CMAKE_OPTDATA_PATH= -DCLR_CMAKE_PGO_OPTIMIZE=0 -DFEATURE_DISTRO_AGNOSTIC_SSL=1 -cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE ~/devel/dotnet/runtime/artifacts/obj/coreclr/Linux.x64.Debug ~/devel/dotnet/runtime/src/coreclr Not searching for unused variables given on the command line. CMake Error: Unknown argument -cmakeargs CMake Error: Run 'cmake --help' for all supported options. ~/devel/dotnet/runtime/src/coreclr Unable to find generated build files for "CoreCLR component" project! Now: $ ./build.sh -cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE ... __DistroRid: linux-x64 Setting up directories for build Checking prerequisites... Commencing build of "install" target in "CoreCLR component" for Linux.x64.Debug in runtime/artifacts/obj/coreclr/Linux.x64.Debug Invoking "runtime/eng/native/gen-buildsys.sh" "runtime/src/coreclr" "runtime/artifacts/obj/coreclr/Linux.x64.Debug" x64 clang Debug "" -DCLR_CMAKE_PGO_INSTRUMENT=0 -DCLR_CMAKE_OPTDATA_PATH= -DCLR_CMAKE_PGO_OPTIMIZE=0 -DFEATURE_DISTRO_AGNOSTIC_SSL=1 -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE runtime/artifacts/obj/coreclr/Linux.x64.Debug runtime/src/coreclr Not searching for unused variables given on the command line. ...
- Loading branch information