diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-11-25 20:58:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-25 20:58:42 +0300 |
| commit | bdf4790fa061704a6e40d55c07b214961e5083cc (patch) | |
| tree | f27e93c85c042726fb1fb8c6901653aef34bcd36 | |
| parent | b42845c56750747af754e57983fe51a6c85bac4e (diff) | |
Fix boehm on Windows i386 builds (#17901)
After https://github.com/mono/mono/pull/16832 was merged the run-msbuild.bat
script has an additional required parameter for specifying the GC.
However the script only passed the MONO_TARGET_GC property to msbuild
if the script had no additional parameters which doesn't make sense.
Always pass the parameter, this should fix the boehm build on Windows i386.
| -rwxr-xr-x | msvc/run-msbuild.bat | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/msvc/run-msbuild.bat b/msvc/run-msbuild.bat index 4ed0d5aa6e2..ceb8c0662c9 100755 --- a/msvc/run-msbuild.bat +++ b/msvc/run-msbuild.bat @@ -67,10 +67,10 @@ call %RUN_MSBUILD_SCRIPT_PATH%setup-windows-env.bat call %RUN_MSBUILD_SCRIPT_PATH%setup-vs-msbuild-env.bat
if "%VS_ADDITIONAL_ARGUMENTS%" == "" (
- set "VS_ADDITIONAL_ARGUMENTS=/p:PlatformToolset=%VS_DEFAULT_PLATFORM_TOOL_SET% /p:MONO_TARGET_GC=%VS_TARGET_GC%"
+ set "VS_ADDITIONAL_ARGUMENTS=/p:PlatformToolset=%VS_DEFAULT_PLATFORM_TOOL_SET%"
)
-set VS_BUILD_ARGS=/p:Configuration=%VS_CONFIGURATION% /p:Platform=%VS_PLATFORM% %VS_ADDITIONAL_ARGUMENTS% /t:%VS_TARGET% /m
+set VS_BUILD_ARGS=/p:Configuration=%VS_CONFIGURATION% /p:Platform=%VS_PLATFORM% /p:MONO_TARGET_GC=%VS_TARGET_GC% %VS_ADDITIONAL_ARGUMENTS% /t:%VS_TARGET% /m
call msbuild.exe %VS_BUILD_ARGS% "%VS_BUILD_PROJ%" && (
set BUILD_RESULT=0
) || (
|