From 508230aa82e7b91d9e949aaaa2ef700f704d40a1 Mon Sep 17 00:00:00 2001 From: Tomas Date: Mon, 7 Dec 2020 23:44:05 +0100 Subject: [PATCH] Counterpart fix for #44973 - remove extra "src" folder level As discussed about two weeks back in context of https://github.com/dotnet/jitutils/pull/304 this change complements the runtime repo PR https://github.com/dotnet/runtime/pull/44973 by fixing the correlated code in jitutils dealing with coreclr paths. Thanks Tomas --- src/jit-format/jit-format.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jit-format/jit-format.cs b/src/jit-format/jit-format.cs index 0b7fb359..fb9d703f 100644 --- a/src/jit-format/jit-format.cs +++ b/src/jit-format/jit-format.cs @@ -408,7 +408,7 @@ public static int Main(string[] args) if (config.Filenames.Count() == 0) { // add all files to a list of files - foreach (string filename in Directory.GetFiles(Path.Combine(config.CoreCLRRoot, "src", config.SourceDirectory))) + foreach (string filename in Directory.GetFiles(Path.Combine(config.CoreCLRRoot, config.SourceDirectory))) { // if it's not a directory, add it to our list if (!Directory.Exists(filename) && (filename.EndsWith(".cpp") || filename.EndsWith(".h") || filename.EndsWith(".hpp"))) @@ -424,7 +424,7 @@ public static int Main(string[] args) string prefix = ""; if (!filename.Contains(config.CoreCLRRoot)) { - prefix = Path.Combine(config.CoreCLRRoot, "src", config.SourceDirectory); + prefix = Path.Combine(config.CoreCLRRoot, config.SourceDirectory); } if (File.Exists(Path.Combine(prefix, filename)))