From 77d88f0379344f08ba32c819109c8c99c2b7fefc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tom=C3=A1=C5=A1=20Rylek?= Date: Fri, 14 Feb 2020 19:45:43 +0100 Subject: [PATCH] Fix CG2 framework compilation on Linux / OSX --- src/coreclr/build-test.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh index 48f695b..ca4dfe6 100755 --- a/src/coreclr/build-test.sh +++ b/src/coreclr/build-test.sh @@ -184,22 +184,25 @@ precompile_coreroot_fx() continue fi - echo Precompiling "$filename" + local commandLine="" if [[ "$__DoCrossgen" != 0 ]]; then - "$__CrossgenExe" /Platform_Assemblies_Paths "$overlayDir" "$filename" 1> "$filename".stdout 2> "$filename".stderr + commandLine="$__CrossgenExe /Platform_Assemblies_Paths $overlayDir $filename" fi if [[ "$__DoCrossgen2" != 0 ]]; then - "$overlayDir"/crossgen2/crossgen2 "$crossgen2References" -O --inputbubble --out "$outputDir"/"$(basename $filename)" "$filename" 1> "$filename".stdout 2> "$filename".stderr + commandLine="$overlayDir/crossgen2/crossgen2 $crossgen2References -O --inputbubble --out $outputDir/$(basename $filename) $filename" fi + echo Precompiling "$filename" + $commandLine 1> "$filename".stdout 2> "$filename".stderr local exitCode="$?" if [[ "$exitCode" != 0 ]]; then if grep -q -e '0x80131018' "$filename".stderr; then printf "\n\t$filename is not a managed assembly.\n\n" else echo Unable to precompile "$filename", exit code is "$exitCode". + echo Command-line: "$commandLine" cat "$filename".stdout cat "$filename".stderr failedAssemblies+=($(basename -- "$filename")) -- 2.7.4