[netcore] Fix make patch-local-dotnet if .dotnet has more than one netcore install...
authorZoltan Varga <vargaz@gmail.com>
Fri, 30 Aug 2019 18:08:41 +0000 (14:08 -0400)
committerGitHub <noreply@github.com>
Fri, 30 Aug 2019 18:08:41 +0000 (14:08 -0400)
Commit migrated from https://github.com/mono/mono/commit/4997d832916d092ee5a69bd28d0ee354a49c6e35

src/mono/netcore/Makefile

index 6aceca8..ab64ae3 100644 (file)
@@ -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