Skip to content

Commit 0eb1143

Browse files
authored
Pass "-cross" arg on linux builds (#369)
Fixes dotnet/runtime#84780. Tested by hooking up the changes locally with runtime's `jitformat.py` and running `python3 ./src/coreclr/scripts/jitformat.py -c /runtime/src/coreclr -o linux -a x64` in our mariner build container. This might break scenarios where jitutils are used outside of ci on a non-mariner build image. Per discussion with @BruceForstall let's make a quick fix to unblock ci, and if this is problematic we could for example add an extra argument that controls whether the `-cross` argument is passed to the runtime build. For context, the `-cross` argument is necessary after dotnet/runtime#84148 because our linux build images have change from centos 7 to CBL-mariner, and the linux builds are now cross-builds that use a rootfs (even x64 and x64-musl).
1 parent 2509fdf commit 0eb1143

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/jit-format/jit-format.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,11 @@ private void validate()
300300
if (!File.Exists(Path.Combine(compileCommandsPath)))
301301
{
302302
Console.WriteLine("Can't find compile_commands.json file. Running configure.");
303-
string[] commandArgs = { _arch, _build, "configureonly", "-cmakeargs", "-DCMAKE_EXPORT_COMPILE_COMMANDS=1" };
303+
List<string> commandArgs = new() { _arch, _build, "configureonly", "-cmakeargs", "-DCMAKE_EXPORT_COMPILE_COMMANDS=1" };
304+
if (_os.ToLower() == "linux")
305+
{
306+
commandArgs.Add("-cross");
307+
}
304308
string buildPath = Path.Combine(_rootPath, "build-runtime.sh");
305309

306310
if (_verbose)

0 commit comments

Comments
 (0)