From 2573040308eb983e570b7f9afa2cc5b2ad8cfbf7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexander=20K=C3=B6plinger?= Date: Sun, 3 Nov 2019 12:27:43 +0100 Subject: [PATCH] [netcore] Disable shared compilation for System.Private.CoreLib There's a dotnet process hanging around which seems to lock the build when called from the SDKs Makefiles. Commit migrated from https://github.com/mono/mono/commit/4888c49c26aa7b3239bebb2048e77ae33c800567 --- src/mono/netcore/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mono/netcore/Makefile b/src/mono/netcore/Makefile index 8a490ac..2311aa4 100644 --- a/src/mono/netcore/Makefile +++ b/src/mono/netcore/Makefile @@ -70,13 +70,13 @@ $(NETCORESDK_FILE): update-corefx: corefx/.stamp-dl-corefx-$(NETCORETESTS_VERSION) corefx/.stamp-dl-corefx-$(NETCORETESTS_VERSION): corefx-restore.csproj - $(DOTNET) build corefx-restore.csproj --runtime $(RID) --packages corefx/packages -p:MicrosoftPrivateCoreFxNETCoreAppVersion=$(NETCORETESTS_VERSION) -p:OutputPath=corefx/restore/ + $(DOTNET) build corefx-restore.csproj --runtime $(RID) --packages corefx/packages -p:MicrosoftPrivateCoreFxNETCoreAppVersion=$(NETCORETESTS_VERSION) -p:OutputPath=corefx/restore/ -p:UseSharedCompilation=false touch $@ update-roslyn: roslyn/packages/microsoft.net.compilers.toolset/$(ROSLYN_VERSION)/microsoft.net.compilers.toolset.nuspec roslyn/packages/microsoft.net.compilers.toolset/$(ROSLYN_VERSION)/microsoft.net.compilers.toolset.nuspec: - $(DOTNET) restore roslyn-restore.csproj -p:RoslynVersion=$(ROSLYN_VERSION) --packages roslyn/packages -p:OutputPath=roslyn/restore/ + $(DOTNET) restore roslyn-restore.csproj -p:RoslynVersion=$(ROSLYN_VERSION) --packages roslyn/packages -p:OutputPath=roslyn/restore/ -p:UseSharedCompilation=false run-sample: prepare $(DOTNET) build sample/HelloWorld @@ -145,7 +145,7 @@ System.Private.CoreLib/src/System/Environment.Mono.cs: System.Private.CoreLib/sr CORLIB_BUILD_FLAGS?=-c Release bcl: update-roslyn System.Private.CoreLib/src/System/Environment.Mono.cs - $(DOTNET) build $(CORETARGETS) $(CORLIB_BUILD_FLAGS) -p:BuildArch=$(COREARCH) \ + $(DOTNET) build $(CORETARGETS) $(CORLIB_BUILD_FLAGS) -p:UseSharedCompilation=false -p:BuildArch=$(COREARCH) \ -p:OutputPath=bin/$(COREARCH) \ -p:RoslynPropsFile="../roslyn/packages/microsoft.net.compilers.toolset/$(ROSLYN_VERSION)/build/Microsoft.Net.Compilers.Toolset.props" \ System.Private.CoreLib/System.Private.CoreLib.csproj -- 2.7.4