From: Zoltan Varga Date: Fri, 30 Aug 2019 18:08:41 +0000 (-0400) Subject: [netcore] Fix make patch-local-dotnet if .dotnet has more than one netcore install... X-Git-Tag: submit/tizen/20210909.063632~10331^2~5^2~636 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dba32d666d8bd601d943ada468ada0addf8756f3;p=platform%2Fupstream%2Fdotnet%2Fruntime.git [netcore] Fix make patch-local-dotnet if .dotnet has more than one netcore install. (mono/mono#16590) Commit migrated from https://github.com/mono/mono/commit/4997d832916d092ee5a69bd28d0ee354a49c6e35 --- diff --git a/src/mono/netcore/Makefile b/src/mono/netcore/Makefile index 6aceca8..ab64ae3 100644 --- a/src/mono/netcore/Makefile +++ b/src/mono/netcore/Makefile @@ -11,7 +11,7 @@ ASPNETCOREAPP_VERSION := 3.0.0-preview-18614-0151 # runtime version used by $(DOTNET) - local .net core sdk to bootstrap stuff # it doesn't match NETCOREAPP_VERSION -BOOTSTRAP_RUNTIME = $(shell ls ../.dotnet/shared/Microsoft.NETCore.App) +BOOTSTRAP_RUNTIME = $(shell ls ../.dotnet/shared/Microsoft.NETCore.App | tail -1) ifeq ($(HOST_PLATFORM),win32) PLATFORM_AOT_SUFFIX := .dll @@ -200,7 +200,7 @@ run-tests-corefx: prepare update-tests-corefx echo "Failures in test suites:"; \ cat .failures; \ echo ""; \ - exit 1; \ + exit 1; \ fi run-tests-corefx-%: prepare update-tests-corefx