Update docker builds to also use Linux for fd

Author: jacob-hughes

build.py

@@ -532,14 +532,14 @@ class RipGrep(BenchmarkSuite):
 
     @property
     def cmd_args(self):
-        return f"-j1 $(cat {str(Path('aux/ripgrep_args').resolve())}/%(benchmark)s) {str(RipGrep.LINUX.src)}"
+        return f"-j1 $(cat {str(Path('aux/ripgrep_args').resolve())}/%(benchmark)s) {str(LINUX.src)}"
 
     def build(self, c, target_dir, install_dir, bench_cfg_bin, profile, env):
-        artefacts.LINUX.fetch()
+        LINUX.fetch()
         self.RIPGREP.fetch()
 
-        if not (self.LINUX.src / ".config").exists():
-            with c.cd(str(self.LINUX.src)):
+        if not (LINUX.src / ".config").exists():
+            with c.cd(str(LINUX.src)):
                 c.run(f"make defconfig")
                 c.run(f"make -j100")
 

patch/grmtools.gc.diff

@@ -1,5 +1,5 @@
 diff --git a/crates/core/main.rs b/crates/core/main.rs
-index 64f35ce..4465c9b 100644
+index 64f35ce..8521fcb 100644
 --- a/crates/core/main.rs
 +++ b/crates/core/main.rs
 @@ -2,6 +2,8 @@
@@ -11,7 +11,7 @@ index 64f35ce..4465c9b 100644
  use std::{io::Write, process::ExitCode};
 
  use ignore::WalkState;
-@@ -16,28 +18,8 @@ mod haystack;
+@@ -16,29 +18,6 @@ mod haystack;
  mod logger;
  mod search;
 
@@ -35,12 +35,12 @@ index 64f35ce..4465c9b 100644
 -// Moreover, we only do this on 64-bit systems since jemalloc doesn't support
 -// i686.
 -#[cfg(all(target_env = "musl", target_pointer_width = "64"))]
- #[global_allocator]
+-#[global_allocator]
 -static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
-+static ALLOC: std::gc::GcAllocator = std::gc::GcAllocator;
- 
+-
  /// Then, as it was, then again it will be.
  fn main() -> ExitCode {
+     match run(flags::parse()) {
 diff --git a/crates/globset/src/lib.rs b/crates/globset/src/lib.rs
 index e804e12..2c43805 100644
 --- a/crates/globset/src/lib.rs

patch/grmtools.rc.diff

@@ -1,17 +1,8 @@
 diff --git a/crates/core/main.rs b/crates/core/main.rs
-index 64f35ce..4465c9b 100644
+index 64f35ce..9e3a32e 100644
 --- a/crates/core/main.rs
 +++ b/crates/core/main.rs
-@@ -2,6 +2,8 @@
- The main entry point into ripgrep.
- */
- 
-+#![feature(gc)]
-+
- use std::{io::Write, process::ExitCode};
- 
- use ignore::WalkState;
-@@ -16,28 +18,8 @@ mod haystack;
+@@ -16,29 +16,6 @@ mod haystack;
  mod logger;
  mod search;
 
@@ -35,9 +26,9 @@ index 64f35ce..4465c9b 100644
 -// Moreover, we only do this on 64-bit systems since jemalloc doesn't support
 -// i686.
 -#[cfg(all(target_env = "musl", target_pointer_width = "64"))]
- #[global_allocator]
+-#[global_allocator]
 -static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
-+static ALLOC: std::gc::GcAllocator = std::gc::GcAllocator;
- 
+-
  /// Then, as it was, then again it will be.
  fn main() -> ExitCode {
+     match run(flags::parse()) {

patch/ripgrep.gc.diff

@@ -375,10 +375,10 @@ index 6556412..b20ef73 100644
 -pub type SOMWeakRef<T> = Weak<RefCell<T>>;
 +pub type SOMRef<T> = Gc<RefCell<T>>;
 diff --git a/som-interpreter-ast/src/main.rs b/som-interpreter-ast/src/main.rs
-index 6658bd0..2a27b6a 100644
+index 6658bd0..9ea24bf 100644
 --- a/som-interpreter-ast/src/main.rs
 +++ b/som-interpreter-ast/src/main.rs
-@@ -1,10 +1,11 @@
+@@ -1,15 +1,14 @@
  //!
  //! This is the interpreter for the Simple Object Machine.
  //!
@@ -391,7 +391,12 @@ index 6658bd0..2a27b6a 100644
 
  use anyhow::anyhow;
  use clap::Parser;
-@@ -17,10 +18,6 @@ use som_interpreter_ast::invokable::Return;
+-#[cfg(feature = "jemalloc")]
+-use jemallocator::Jemalloc;
+ 
+ mod shell;
+ 
+@@ -17,10 +16,6 @@ use som_interpreter_ast::invokable::Return;
  use som_interpreter_ast::universe::Universe;
  use som_interpreter_ast::value::Value;
 
@@ -402,7 +407,7 @@ index 6658bd0..2a27b6a 100644
  #[derive(Debug, Clone, PartialEq, clap::StructOpt)]
  #[structopt(about, author)]
  struct Options {
-@@ -65,7 +62,7 @@ fn main() -> anyhow::Result<()> {
+@@ -65,7 +60,7 @@ fn main() -> anyhow::Result<()> {
 
              let args = std::iter::once(String::from(file_stem))
                  .chain(opts.args.iter().cloned())
@@ -411,7 +416,7 @@ index 6658bd0..2a27b6a 100644
                  .map(Value::String)
                  .collect();
 
-@@ -75,7 +72,7 @@ fn main() -> anyhow::Result<()> {
+@@ -75,7 +70,7 @@ fn main() -> anyhow::Result<()> {
 
              // let class = universe.load_class_from_path(file)?;
              // let instance = Instance::from_class(class);
@@ -1301,25 +1306,21 @@ index 5ee4521..cda4c2b 100644
                  Literal::Block(val) => Value::Block(val),
              };
 diff --git a/som-interpreter-bc/src/lib.rs b/som-interpreter-bc/src/lib.rs
-index 2ede99f..1696f3c 100644
+index 2ede99f..4847c03 100644
 --- a/som-interpreter-bc/src/lib.rs
 +++ b/som-interpreter-bc/src/lib.rs
-@@ -2,8 +2,13 @@
+@@ -2,8 +2,9 @@
  //! This is the interpreter for the Simple Object Machine.
  //!
 
 +#![feature(gc)]
  use std::cell::RefCell;
 -use std::rc::{Rc, Weak};
 +use std::gc::Gc;
-+use std::gc::GcAllocator;
-+
-+#[global_allocator]
-+static A: GcAllocator = GcAllocator;
 
  /// Facilities for manipulating blocks.
  pub mod block;
-@@ -33,6 +38,4 @@ pub mod universe;
+@@ -33,6 +34,4 @@ pub mod universe;
  pub mod value;
 
  /// A strong and owning reference to an object.
@@ -1328,10 +1329,10 @@ index 2ede99f..1696f3c 100644
 -pub type SOMWeakRef<T> = Weak<RefCell<T>>;
 +pub type SOMRef<T> = Gc<RefCell<T>>;
 diff --git a/som-interpreter-bc/src/main.rs b/som-interpreter-bc/src/main.rs
-index 62aa750..951bf39 100644
+index 62aa750..552f6d8 100644
 --- a/som-interpreter-bc/src/main.rs
 +++ b/som-interpreter-bc/src/main.rs
-@@ -1,10 +1,11 @@
+@@ -1,15 +1,14 @@
  //!
  //! This is the interpreter for the Simple Object Machine.
  //!
@@ -1344,7 +1345,12 @@ index 62aa750..951bf39 100644
 
  use anyhow::{bail, Context};
  use clap::Parser;
-@@ -19,10 +20,6 @@ use som_interpreter_bc::method::{Method, MethodKind};
+-#[cfg(feature = "jemalloc")]
+-use jemallocator::Jemalloc;
+ 
+ mod shell;
+ 
+@@ -19,10 +18,6 @@ use som_interpreter_bc::method::{Method, MethodKind};
  use som_interpreter_bc::universe::Universe;
  use som_interpreter_bc::value::Value;
 
@@ -1355,7 +1361,7 @@ index 62aa750..951bf39 100644
  #[derive(Debug, Clone, PartialEq, clap::StructOpt)]
  #[clap(about, author)]
  struct Options {
-@@ -74,7 +71,7 @@ fn main() -> anyhow::Result<()> {
+@@ -74,7 +69,7 @@ fn main() -> anyhow::Result<()> {
 
      let args = std::iter::once(String::from(file_stem))
          .chain(opts.args.iter().cloned())
@@ -1364,7 +1370,7 @@ index 62aa750..951bf39 100644
          .map(Value::String)
          .collect();
 
-@@ -86,7 +83,7 @@ fn main() -> anyhow::Result<()> {
+@@ -86,7 +81,7 @@ fn main() -> anyhow::Result<()> {
 
      // let class = universe.load_class_from_path(file)?;
      // let instance = som_interpreter::instance::Instance::from_class(class);
@@ -1373,7 +1379,7 @@ index 62aa750..951bf39 100644
 
      // let invokable = instance.lookup_method(&universe, "run").unwrap();
      // let output = som_interpreter::invokable::Invoke::invoke(invokable.as_ref(), &mut universe, vec![instance]);
-@@ -119,7 +116,7 @@ fn disassemble_class(opts: Options) -> anyhow::Result<()> {
+@@ -119,7 +114,7 @@ fn disassemble_class(opts: Options) -> anyhow::Result<()> {
 
      let class = universe.load_class(file_stem)?;