Skip to content

Make jit-format use build-runtime scripts instead of build scripts. #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkoritzinsky merged 1 commit into from
Apr 8, 2020
Merged

Make jit-format use build-runtime scripts instead of build scripts. #260

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/jit-format/jit-format.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ private void validate()
// If _rootPath doesn't exist, it is an invalid path
_syntaxResult.ReportError("Invalid path to coreclr directory. Specify with --coreclr");
}
else if (!File.Exists(Path.Combine(_rootPath, "build.cmd")) || !File.Exists(Path.Combine(_rootPath, "build.sh")) || !File.Exists(Path.Combine(_rootPath, "clr.featuredefines.props")))
else if (!File.Exists(Path.Combine(_rootPath, "build-runtime.cmd")) || !File.Exists(Path.Combine(_rootPath, "build-runtime.sh")) || !File.Exists(Path.Combine(_rootPath, "clr.featuredefines.props")))
{
// Doesn't look like the coreclr directory.
_syntaxResult.ReportError("Invalid path to coreclr directory. Specify with --coreclr");
Expand All @@ -232,7 +232,7 @@ private void validate()
}

string[] commandArgs = { _arch, _build, "usenmakemakefiles" };
string buildPath = Path.Combine(_rootPath, "build.cmd");
string buildPath = Path.Combine(_rootPath, "build-runtime.cmd");

if (_verbose)
{
Expand Down Expand Up @@ -264,7 +264,7 @@ private void validate()
{
Console.WriteLine("Can't find compile_commands.json file. Running configure.");
string[] commandArgs = { _arch, _build, "configureonly", "-cmakeargs", "-DCMAKE_EXPORT_COMPILE_COMMANDS=1" };
string buildPath = Path.Combine(_rootPath, "build.sh");
string buildPath = Path.Combine(_rootPath, "build-runtime.sh");

if (_verbose)
{
Expand All @@ -275,7 +275,7 @@ private void validate()

if (result.ExitCode != 0)
{
Console.WriteLine("There was an error running CMake to generate compile_commands.json. Please run build.sh configureonly");
Console.WriteLine("There was an error running CMake to generate compile_commands.json. Please run build-runtime.sh configureonly");
Environment.Exit(-1);
}
}
Expand Down