From 0e8523e37bc3b8c690bf2d52a459380a20e85570 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 5 Oct 2023 05:25:46 +0200 Subject: [PATCH] Add -skipcrossarchnative and -verbose options (#90554) * Add CoreclrVerbose=true when --verbose is passed as option to build.sh Sponsored by: Tekvox Inc. Cc: Jim Reinhart Cc: James Autry Cc: Matthew Maron Signed-off-by: Giulio Benetti * Remove leftover comment about -skipcrossarchnative During commit 7d562f9d2a4285881ae1c412aecb164dc9370013 comment about -skipcrossarchnative has been forgotten, so let's remove it since that flag is not available anymore. Signed-off-by: Giulio Benetti * Correct shift value --------- Signed-off-by: Giulio Benetti Co-authored-by: Giulio Benetti Co-authored-by: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com> --- eng/build.sh | 5 +++++ src/coreclr/build-runtime.sh | 1 - src/coreclr/runtime.proj | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/eng/build.sh b/eng/build.sh index c68a742ffbebc..8ab3bf67e0068 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -524,6 +524,11 @@ while [[ $# > 0 ]]; do shift 2 ;; + -verbose) + arguments="$arguments /p:CoreclrVerbose=true" + shift 1 + ;; + *) extraargs="$extraargs $1" shift 1 diff --git a/src/coreclr/build-runtime.sh b/src/coreclr/build-runtime.sh index 06f79ec34b420..58d1d2eb00ab0 100755 --- a/src/coreclr/build-runtime.sh +++ b/src/coreclr/build-runtime.sh @@ -20,7 +20,6 @@ export PYTHON usage_list+=("-pgodatapath: path to profile guided optimization data.") usage_list+=("-pgoinstrument: generate instrumented code for profile guided optimization enabled binaries.") -usage_list+=("-skipcrossarchnative: Skip building cross-architecture native binaries.") usage_list+=("-staticanalyzer: use scan_build static analyzer.") usage_list+=("-component: Build individual components instead of the full project. Available options are 'hosts', 'jit', 'runtime', 'paltests', 'alljits', 'iltools', 'nativeaot', and 'spmi'. Can be specified multiple times.") usage_list+=("-subdir: Append a directory with the provided name to the obj and bin paths.") diff --git a/src/coreclr/runtime.proj b/src/coreclr/runtime.proj index 4164484606c1b..a6442c16173ed 100644 --- a/src/coreclr/runtime.proj +++ b/src/coreclr/runtime.proj @@ -33,6 +33,7 @@ <_CoreClrBuildArg Condition="'$(PortableBuild)' != 'true'" Include="-portablebuild=false" /> <_CoreClrBuildArg Condition="'$(KeepNativeSymbols)' != 'false'" Include="-keepnativesymbols" /> <_CoreClrBuildArg Include="-os $(_BuildNativeTargetOS)" /> + <_CoreClrBuildArg Condition="'$(CoreclrVerbose)' == 'true'" Include="-verbose" /> <_CoreClrBuildArg Condition="$([MSBuild]::IsOsPlatform(Windows)) and ('$(TargetArchitecture)' == 'x86' or '$(TargetArchitecture)' == 'x64') and