From 9067864afef909e445dfe504a65dcac88167ea43 Mon Sep 17 00:00:00 2001 From: Bryan Thornbury Date: Fri, 20 Nov 2015 17:24:00 -0800 Subject: [PATCH] Changes for corehost default path resolution on mac --- src/corehost/src/pal.unix.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/corehost/src/pal.unix.cpp b/src/corehost/src/pal.unix.cpp index d338d4bc0..89fa7d8cd 100644 --- a/src/corehost/src/pal.unix.cpp +++ b/src/corehost/src/pal.unix.cpp @@ -24,14 +24,15 @@ bool pal::find_coreclr(pal::string_t& recv) pal::string_t candidate; pal::string_t test; - // Try /usr/share/dotnet and /usr/local/share/dotnet + // Try /usr/share/dotnet and /usr/local/share/dotnet/cli + // TODO: These paths should be consistent candidate.assign("/usr/share/dotnet/runtime/coreclr"); if (coreclr_exists_in_dir(candidate)) { recv.assign(candidate); return true; } - - candidate.assign("/usr/local/share/dotnet/runtime/coreclr"); + + candidate.assign("/usr/local/share/dotnet/cli/runtime/coreclr"); if (coreclr_exists_in_dir(candidate)) { recv.assign(candidate); return true;