diff --git a/lib/buildsystems/autotools.rb b/lib/buildsystems/autotools.rb
index 3295db4d2..dc257231c 100644
--- a/lib/buildsystems/autotools.rb
+++ b/lib/buildsystems/autotools.rb
@@ -23,8 +23,7 @@ class Autotools < Package
         puts 'Using filefix.'.orange
         system 'filefix'
       end
-      @mold_linker_prefix_cmd = CREW_LINKER == 'mold' ? 'mold -run ' : ''
-      system "#{@pre_configure_options} #{@mold_linker_prefix_cmd}./configure #{CREW_CONFIGURE_OPTIONS} #{@configure_options}"
+      system "#{@pre_configure_options} ./configure #{CREW_CONFIGURE_OPTIONS} #{@configure_options}"
     end
     system 'make'
     @configure_build_extras&.call
diff --git a/lib/buildsystems/cmake.rb b/lib/buildsystems/cmake.rb
index b991db3e5..9021841bd 100644
--- a/lib/buildsystems/cmake.rb
+++ b/lib/buildsystems/cmake.rb
@@ -11,8 +11,7 @@ class CMake < Package
     method_list.each do |method|
       puts "#{method}: #{send method}".orange
     end
-    @mold_linker_prefix_cmd = CREW_LINKER == 'mold' ? 'mold -run' : ''
-    system "#{@pre_cmake_options} #{@mold_linker_prefix_cmd} cmake -S #{@cmake_build_relative_dir} -B #{@cmake_build_relative_dir}/builddir -G Ninja #{@crew_cmake_options} #{@cmake_options}"
+    system "#{@pre_cmake_options} cmake -S #{@cmake_build_relative_dir} -B #{@cmake_build_relative_dir}/builddir -G Ninja #{@crew_cmake_options} #{@cmake_options}"
     system "#{CREW_NINJA} -C #{@cmake_build_relative_dir}/builddir"
     @cmake_build_extras&.call
   end
diff --git a/lib/buildsystems/meson.rb b/lib/buildsystems/meson.rb
index 2f85d11cc..73a48cf3b 100644
--- a/lib/buildsystems/meson.rb
+++ b/lib/buildsystems/meson.rb
@@ -5,13 +5,12 @@ class Meson < Package
 
   def self.build
     @crew_meson_options = @no_lto ? CREW_MESON_OPTIONS.sub('-Db_lto=true', '-Db_lto=false') : CREW_MESON_OPTIONS
-    @mold_linker_prefix_cmd = CREW_LINKER == 'mold' ? 'mold -run' : ''
     puts 'Additional meson options being used:'.orange
     method_list = methods.grep(/meson_/).delete_if { |i| send(i).blank? }
     method_list.each do |method|
       puts "#{method}: #{send method}".orange
     end
-    system "#{@pre_meson_options} #{@mold_linker_prefix_cmd} meson setup #{@crew_meson_options} #{@meson_options} builddir"
+    system "#{@pre_meson_options} meson setup #{@crew_meson_options} #{@meson_options} builddir"
     system 'meson configure --no-pager builddir'
     system "#{CREW_NINJA} -C builddir"
     @meson_build_extras&.call
diff --git a/lib/buildsystems/perl.rb b/lib/buildsystems/perl.rb
index f90cd98cc..995397646 100644
--- a/lib/buildsystems/perl.rb
+++ b/lib/buildsystems/perl.rb
@@ -10,8 +10,7 @@ class PERL < Package
   end
 
   def self.build
-    @mold_linker_prefix_cmd = CREW_LINKER == 'mold' ? 'mold -run' : ''
-    system "#{@pre_perl_options} #{@mold_linker_prefix_cmd} make"
+    system "#{@pre_perl_options} make"
     @perl_build_extras&.call
   end
 
diff --git a/lib/const.rb b/lib/const.rb
index 714f6d64e..6e7d94366 100644
--- a/lib/const.rb
+++ b/lib/const.rb
@@ -3,7 +3,7 @@
 require 'etc'
 
 OLD_CREW_VERSION ||= defined?(CREW_VERSION) ? CREW_VERSION : '1.0'
-CREW_VERSION ||= '1.60.0' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION
+CREW_VERSION ||= '1.60.1' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION
 
 # Kernel architecture.
 KERN_ARCH ||= Etc.uname[:machine]
@@ -243,7 +243,7 @@ CREW_ENV_FNO_LTO_OPTIONS_HASH ||= {
   'CXXFLAGS'        => CREW_COMMON_FNO_LTO_FLAGS,
   'FCFLAGS'         => CREW_COMMON_FNO_LTO_FLAGS,
   'FFLAGS'          => CREW_COMMON_FNO_LTO_FLAGS,
-  'LD_LIBRARY_PATH' => CREW_LIB_PREFIX,
+  'LIBRARY_PATH'    => "#{CREW_GLIBC_PREFIX}:#{CREW_LIB_PREFIX}",
   'LDFLAGS'         => CREW_FNO_LTO_LDFLAGS
 }
 # parse from hash to shell readable string
@@ -280,9 +280,11 @@ CREW_NINJA ||= ENV.fetch('CREW_NINJA', 'ninja') unless defined?(CREW_NINJA)
 # Cmake sometimes wants to use LIB_SUFFIX to install libs in LIB64, so specify such for x86_64
 # This is often considered deprecated. See discussio at https://gitlab.kitware.com/cmake/cmake/-/issues/18640
 # and also https://bugzilla.redhat.com/show_bug.cgi?id=1425064
+# CMAKE_LIBRARY_PATH is the build LIBRARY_PATH, as opposed to
+# CMAKE_INSTALL_LIBDIR which defaults to lib or lib64.
 CREW_CMAKE_OPTIONS ||= <<~OPT.chomp
   -DCMAKE_INSTALL_PREFIX=#{CREW_PREFIX} \
-  -DCMAKE_LIBRARY_PATH=#{CREW_LIB_PREFIX} \
+  -DCMAKE_LIBRARY_PATH='#{CREW_GLIBC_PREFIX};#{CREW_LIB_PREFIX}' \
   -DCMAKE_C_FLAGS='#{CREW_COMMON_FLAGS.gsub(/-fuse-ld=.{2,4}\s/, '')}' \
   -DCMAKE_CXX_FLAGS='#{CREW_COMMON_FLAGS.gsub(/-fuse-ld=.{2,4}\s/, '')}' \
   -DCMAKE_EXE_LINKER_FLAGS='#{CREW_LINKER_FLAGS}' \
diff --git a/manifest/armv7l/n/nano.filelist b/manifest/armv7l/n/nano.filelist
index 5a8cc93e4..72e3c4a53 100644
--- a/manifest/armv7l/n/nano.filelist
+++ b/manifest/armv7l/n/nano.filelist
@@ -1,3 +1,4 @@
+/home/chronos/user/.nanorc
 /usr/local/bin/nano
 /usr/local/bin/rnano
 /usr/local/share/doc/nano/faq.html
@@ -92,4 +93,3 @@
 /usr/local/share/nano/texinfo.nanorc
 /usr/local/share/nano/xml.nanorc
 /usr/local/share/nano/yaml.nanorc
-/home/chronos/user/.nanorc
diff --git a/manifest/i686/n/nano.filelist b/manifest/i686/n/nano.filelist
index 5a8cc93e4..72e3c4a53 100644
--- a/manifest/i686/n/nano.filelist
+++ b/manifest/i686/n/nano.filelist
@@ -1,3 +1,4 @@
+/home/chronos/user/.nanorc
 /usr/local/bin/nano
 /usr/local/bin/rnano
 /usr/local/share/doc/nano/faq.html
@@ -92,4 +93,3 @@
 /usr/local/share/nano/texinfo.nanorc
 /usr/local/share/nano/xml.nanorc
 /usr/local/share/nano/yaml.nanorc
-/home/chronos/user/.nanorc
diff --git a/manifest/x86_64/n/nano.filelist b/manifest/x86_64/n/nano.filelist
index 5a8cc93e4..72e3c4a53 100644
--- a/manifest/x86_64/n/nano.filelist
+++ b/manifest/x86_64/n/nano.filelist
@@ -1,3 +1,4 @@
+/home/chronos/user/.nanorc
 /usr/local/bin/nano
 /usr/local/bin/rnano
 /usr/local/share/doc/nano/faq.html
@@ -92,4 +93,3 @@
 /usr/local/share/nano/texinfo.nanorc
 /usr/local/share/nano/xml.nanorc
 /usr/local/share/nano/yaml.nanorc
-/home/chronos/user/.nanorc
diff --git a/packages/alsa_lib.rb b/packages/alsa_lib.rb
index 463b7447f..d5faad868 100644
--- a/packages/alsa_lib.rb
+++ b/packages/alsa_lib.rb
@@ -23,7 +23,7 @@ class Alsa_lib < Autotools
   def self.build
     @py_ver = `python -c "import sys; version = '.'.join(map(str, sys.version_info[:2])) ; print(version)"`.chomp
     system 'autoreconf -fiv'
-    system "mold -run ./configure #{CREW_CONFIGURE_OPTIONS} \
+    system "./configure #{CREW_CONFIGURE_OPTIONS} \
        --without-debug \
        --disable-maintainer-mode \
        --with-pythonlibs=-lpython#{@py_ver} \
diff --git a/packages/alsa_tools.rb b/packages/alsa_tools.rb
index b6196c9ce..de69d5eee 100644
--- a/packages/alsa_tools.rb
+++ b/packages/alsa_tools.rb
@@ -45,7 +45,7 @@ class Alsa_tools < Package
   end
 
   def self.build
-    system "GITCOMPILE_ARGS='--prefix=#{CREW_PREFIX}' mold -run make all"
+    system "GITCOMPILE_ARGS='--prefix=#{CREW_PREFIX}' make all"
   end
 
   def self.install
diff --git a/packages/chromaprint.rb b/packages/chromaprint.rb
index 9a546ffc5..6e746f2b4 100644
--- a/packages/chromaprint.rb
+++ b/packages/chromaprint.rb
@@ -21,7 +21,7 @@ class Chromaprint < Package
   depends_on 'glibc' # R
 
   def self.build
-    system "mold -run cmake -B builddir -G Ninja #{CREW_CMAKE_LIBSUFFIX_OPTIONS} \
+    system "cmake -B builddir -G Ninja #{CREW_CMAKE_LIBSUFFIX_OPTIONS} \
       -DBUILD_TOOLS=ON \
       -DBUILD_TESTS=ON"
     system "#{CREW_NINJA} -C builddir"
diff --git a/packages/cjson.rb b/packages/cjson.rb
index 07cee8560..9613d3330 100644
--- a/packages/cjson.rb
+++ b/packages/cjson.rb
@@ -23,7 +23,7 @@ class Cjson < Package
   depends_on 'glibc' # R
 
   def self.build
-    system "mold -run cmake -B builddir #{CREW_CMAKE_OPTIONS} \
+    system "cmake -B builddir #{CREW_CMAKE_OPTIONS} \
         -DBUILD_SHARED_LIBS=ON \
         -Wno-dev \
         -G Ninja"
diff --git a/packages/cmake.rb b/packages/cmake.rb
index 92163ce2e..fe24c9290 100644
--- a/packages/cmake.rb
+++ b/packages/cmake.rb
@@ -3,7 +3,7 @@ require 'buildsystems/cmake'
 class Cmake < CMake
   description 'CMake is an open-source, cross-platform family of tools designed to build, test and package software.'
   homepage 'https://cmake.org/'
-  version '4.0.1'
+  version '4.0.2'
   license 'CMake'
   compatibility 'all'
   source_url 'https://github.com/Kitware/CMake.git'
@@ -11,10 +11,10 @@ class Cmake < CMake
   binary_compression 'tar.zst'
 
   binary_sha256({
-    aarch64: 'f64b7ce6c6ca6f4bc57cd6153297db2ae621a05438b518f0d1798f7069c4d579',
-     armv7l: 'f64b7ce6c6ca6f4bc57cd6153297db2ae621a05438b518f0d1798f7069c4d579',
-       i686: 'bc2154e016e95b86da7a7d06831b9db39fc21a87d3eaa34c9a4f29aa61bb2070',
-     x86_64: '1e37790684ed8ade3d21b0c8e024d3a41a87f7792092f843dfba21c3ebe6c1ea'
+    aarch64: 'f8ec0e69508c0c0f1429d7ec391181b4afef511ef6a7c560bcb28792419b4da5',
+     armv7l: 'f8ec0e69508c0c0f1429d7ec391181b4afef511ef6a7c560bcb28792419b4da5',
+       i686: '8656b9454e7a33f57015bd47e1285c904702a366fbf4865d05fbd51b55b15ffa',
+     x86_64: '5aa355a808f963873936f6cd3cf0ab926999169249d42fff4696ae8a1c787bbf'
   })
 
   depends_on 'bzip2' => :build
diff --git a/packages/cmus.rb b/packages/cmus.rb
index 9be793152..2d29622f6 100644
--- a/packages/cmus.rb
+++ b/packages/cmus.rb
@@ -36,7 +36,7 @@ class Cmus < Package
 
   def self.build
     system "sed -i 's,/usr/include,#{CREW_PREFIX}/include,g' configure"
-    system "mold -run ./configure prefix=#{CREW_PREFIX} libdir=#{CREW_LIB_PREFIX}"
+    system "./configure prefix=#{CREW_PREFIX} libdir=#{CREW_LIB_PREFIX}"
     system 'make'
   end
 
diff --git a/packages/command_not_found.rb b/packages/command_not_found.rb
index c0e7f904d..bec1fac8c 100644
--- a/packages/command_not_found.rb
+++ b/packages/command_not_found.rb
@@ -22,7 +22,7 @@ class Command_not_found < Package
   print_source_bashrc
 
   def self.build
-    system "mold -run cc #{CREW_COMMON_FLAGS} command-not-found-handler.c -o command-not-found-handler"
+    system "cc #{CREW_COMMON_FLAGS} command-not-found-handler.c -o command-not-found-handler"
   end
 
   def self.install
diff --git a/packages/crew_mvdir.rb b/packages/crew_mvdir.rb
index 600c4ad6a..1843cdb73 100644
--- a/packages/crew_mvdir.rb
+++ b/packages/crew_mvdir.rb
@@ -20,7 +20,7 @@ class Crew_mvdir < Package
   depends_on 'glibc' # R
 
   def self.build
-    system "mold -run cc #{CREW_COMMON_FLAGS} crew-mvdir.c -o crew-mvdir"
+    system "cc #{CREW_COMMON_FLAGS} crew-mvdir.c -o crew-mvdir"
   end
 
   def self.install
diff --git a/packages/editorconfig_core_c.rb b/packages/editorconfig_core_c.rb
index fdfa945c9..93bf7e095 100644
--- a/packages/editorconfig_core_c.rb
+++ b/packages/editorconfig_core_c.rb
@@ -25,11 +25,11 @@ class Editorconfig_core_c < Package
   depends_on 'glibc' # R
 
   def self.build
-    system "mold -run cmake -B builddir \
+    system "cmake -B builddir \
           #{CREW_CMAKE_OPTIONS} \
           -Wdev \
           -G Ninja"
-    system "mold -run #{CREW_NINJA} -C builddir"
+    system "#{CREW_NINJA} -C builddir"
   end
 
   def self.install
diff --git a/packages/gcc_build.rb b/packages/gcc_build.rb
index a97f9e1af..91064cb3e 100644
--- a/packages/gcc_build.rb
+++ b/packages/gcc_build.rb
@@ -169,7 +169,7 @@ class Gcc_build < Package
         }.transform_keys(&:to_s)
 
       system configure_env, <<~BUILD.chomp
-        mold -run ../configure #{CREW_CONFIGURE_OPTIONS} \
+        ../configure #{CREW_CONFIGURE_OPTIONS} \
           #{@gcc_global_opts} \
           #{@archflags} \
           --with-native-system-header-dir=#{CREW_PREFIX}/include \
diff --git a/packages/gdbm.rb b/packages/gdbm.rb
index 2e8e7dbc3..95d328e5c 100644
--- a/packages/gdbm.rb
+++ b/packages/gdbm.rb
@@ -22,7 +22,7 @@ class Gdbm < Package
   depends_on 'gcc_lib' # R
 
   def self.build
-    system "mold -run ./configure \
+    system "./configure \
       #{CREW_CONFIGURE_OPTIONS}"
     system 'make'
   end
diff --git a/packages/gdk_pixbuf.rb b/packages/gdk_pixbuf.rb
index ae12afb84..f3aa697a9 100644
--- a/packages/gdk_pixbuf.rb
+++ b/packages/gdk_pixbuf.rb
@@ -39,7 +39,7 @@ class Gdk_pixbuf < Package
   gnome
 
   def self.build
-    system "mold -run meson setup #{CREW_MESON_OPTIONS} \
+    system "meson setup #{CREW_MESON_OPTIONS} \
       -Dinstalled_tests=false \
       -Dbuiltin_loaders=all \
       -Drelocatable=true \
@@ -48,7 +48,7 @@ class Gdk_pixbuf < Package
       -Dman=true \
       -Dtests=false \
       builddir"
-    system 'mold -run samu -C builddir'
+    system 'samu -C builddir'
   end
 
   def self.install
diff --git a/packages/geany.rb b/packages/geany.rb
index a18056c5b..7d88ad1ef 100644
--- a/packages/geany.rb
+++ b/packages/geany.rb
@@ -32,7 +32,7 @@ class Geany < Package
   @xdg_config_home = "#{CREW_PREFIX}/.config" if @xdg_config_home.to_s.empty?
 
   def self.build
-    system "mold -run meson setup \
+    system "meson setup \
       #{CREW_MESON_OPTIONS} \
       -Dapi-docs=disabled \
       -Dgtkdoc=true \
diff --git a/packages/icu4c.rb b/packages/icu4c.rb
index a7e278dd6..af8b9540d 100644
--- a/packages/icu4c.rb
+++ b/packages/icu4c.rb
@@ -22,7 +22,7 @@ class Icu4c < Package
 
   def self.build
     Dir.chdir 'source' do
-      system "mold -run ./configure \
+      system "./configure \
         #{CREW_CONFIGURE_OPTIONS} \
         --enable-shared \
         --disable-samples \
diff --git a/packages/js102.rb b/packages/js102.rb
index 86b86a5d9..9bb65948b 100644
--- a/packages/js102.rb
+++ b/packages/js102.rb
@@ -119,7 +119,7 @@ class Js102 < Package
             LDFLAGS='-lreadline -ltinfo' \
             MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system \
             MOZCONFIG=../.mozconfig \
-            mold -run ../mach build"
+            ../mach build"
     end
   end
 
diff --git a/packages/krb5.rb b/packages/krb5.rb
index 66b5c84a5..aa885264b 100644
--- a/packages/krb5.rb
+++ b/packages/krb5.rb
@@ -31,7 +31,7 @@ class Krb5 < Package
       @path = "#{CREW_PREFIX}/bin:" + ENV.fetch('PATH', nil)
       system "CPPFLAGS='#{@cppflags}' \
       PATH=#{@path} \
-      mold -run ./configure #{CREW_CONFIGURE_OPTIONS} \
+      ./configure #{CREW_CONFIGURE_OPTIONS} \
       --localstatedir=#{CREW_PREFIX}/var/krb5kdc \
       --enable-shared \
       --with-system-et \
diff --git a/packages/leptonica.rb b/packages/leptonica.rb
index 8bced864b..ac9acbc24 100644
--- a/packages/leptonica.rb
+++ b/packages/leptonica.rb
@@ -39,7 +39,7 @@ class Leptonica < Package
   end
 
   def self.build
-    system "mold -run cmake -B builddir #{CREW_CMAKE_OPTIONS} \
+    system "cmake -B builddir #{CREW_CMAKE_OPTIONS} \
         -DBUILD_SHARED_LIBS=ON \
         -Wno-dev \
         -G Ninja"
diff --git a/packages/libdb.rb b/packages/libdb.rb
index c67413cfa..dd53de976 100644
--- a/packages/libdb.rb
+++ b/packages/libdb.rb
@@ -26,7 +26,7 @@ class Libdb < Package
 
   def self.build
     Dir.chdir 'build_unix' do
-      system "mold -run ../dist/configure #{CREW_CONFIGURE_OPTIONS} \
+      system "../dist/configure #{CREW_CONFIGURE_OPTIONS} \
       --enable-compat185 \
       --enable-cxx \
       --enable-dbm \
diff --git a/packages/libefl.rb b/packages/libefl.rb
index e78650e24..e9ee4d204 100644
--- a/packages/libefl.rb
+++ b/packages/libefl.rb
@@ -86,7 +86,7 @@ class Libefl < Package
        -Decore-imf-loaders-disabler=ibus,scim \
        builddir"
     system 'meson configure --no-pager builddir'
-    system 'mold -run samu -C builddir'
+    system 'samu -C builddir'
   end
 
   def self.install
diff --git a/packages/libgd.rb b/packages/libgd.rb
index 07de3199c..03da433ba 100644
--- a/packages/libgd.rb
+++ b/packages/libgd.rb
@@ -24,11 +24,11 @@ class Libgd < Package
   depends_on 'glibc' # R
 
   def self.build
-    system "mold -run cmake -B builddir \
+    system "cmake -B builddir \
         -G Ninja \
         #{CREW_CMAKE_OPTIONS} \
         -DCMAKE_INCLUDE_PATH=#{CREW_PREFIX}/include"
-    system "mold -run #{CREW_NINJA} -C builddir"
+    system "#{CREW_NINJA} -C builddir"
   end
 
   def self.install
diff --git a/packages/libmediainfo.rb b/packages/libmediainfo.rb
index d7bddb362..a1c6e66e4 100644
--- a/packages/libmediainfo.rb
+++ b/packages/libmediainfo.rb
@@ -27,7 +27,7 @@ class Libmediainfo < Package
   end
 
   def self.build
-    system "mold -run ./SO_Compile.sh #{CREW_CONFIGURE_OPTIONS}"
+    system "./SO_Compile.sh #{CREW_CONFIGURE_OPTIONS}"
   end
 
   def self.install
diff --git a/packages/librhash.rb b/packages/librhash.rb
index f5af4c310..4b7f35346 100644
--- a/packages/librhash.rb
+++ b/packages/librhash.rb
@@ -22,7 +22,7 @@ class Librhash < Package
   depends_on 'gcc_lib' # R
 
   def self.build
-    system "mold -run ./configure \
+    system "./configure \
             --prefix=#{CREW_PREFIX} \
             --libdir=#{CREW_LIB_PREFIX}\
             --enable-gettext \
diff --git a/packages/libsecret.rb b/packages/libsecret.rb
index b28a1ea65..1bfb0f073 100644
--- a/packages/libsecret.rb
+++ b/packages/libsecret.rb
@@ -29,7 +29,7 @@ class Libsecret < Package
       -Dmanpage=false \
       build"
     system 'meson configure build'
-    system 'mold -run samu -C build'
+    system 'samu -C build'
   end
 
   def self.install
diff --git a/packages/libsoup2.rb b/packages/libsoup2.rb
index 99976358d..ec99b1b20 100644
--- a/packages/libsoup2.rb
+++ b/packages/libsoup2.rb
@@ -39,7 +39,7 @@ class Libsoup2 < Package
       builddir"
     system 'meson configure --no-pager builddir'
     system "sed -i 's#-R#-Wl,-rpath=#g' builddir/build.ninja"
-    system 'mold -run samu -C builddir'
+    system 'samu -C builddir'
   end
 
   def self.install
diff --git a/packages/libvncserver.rb b/packages/libvncserver.rb
index f22ff343c..68ca19bb4 100644
--- a/packages/libvncserver.rb
+++ b/packages/libvncserver.rb
@@ -29,7 +29,7 @@ class Libvncserver < Package
   depends_on 'zlib' # R
 
   def self.build
-    system "mold -run cmake -B builddir #{CREW_CMAKE_OPTIONS} \
+    system "cmake -B builddir #{CREW_CMAKE_OPTIONS} \
         -DWITH_SYSTEMD=OFF \
         -Wno-dev \
         -G Ninja"
diff --git a/packages/libvterm.rb b/packages/libvterm.rb
index d1b1dec97..4587468a7 100644
--- a/packages/libvterm.rb
+++ b/packages/libvterm.rb
@@ -23,7 +23,7 @@ class Libvterm < Package
   depends_on 'glibc'
 
   def self.build
-    system "mold -run make PREFIX=#{CREW_PREFIX} LIBDIR=#{CREW_LIB_PREFIX}"
+    system "make PREFIX=#{CREW_PREFIX} LIBDIR=#{CREW_LIB_PREFIX}"
   end
 
   def self.install
diff --git a/packages/llvm17_build.rb b/packages/llvm17_build.rb
index 7558d0462..9475c44b3 100644
--- a/packages/llvm17_build.rb
+++ b/packages/llvm17_build.rb
@@ -122,7 +122,7 @@ class Llvm17_build < Package
         gnuc_lib=#{CREW_LIB_PREFIX}/gcc/${machine}/${version}
         clang++ -fPIC  -rtlib=compiler-rt -stdlib=libc++ -cxx-isystem ${cxx_sys} -I ${cxx_inc} -B ${gnuc_lib} -L ${gnuc_lib} "$@"
       CLCPLUSPLUS_EOF
-      system "mold -run cmake -B builddir -G Ninja llvm \
+      system "cmake -B builddir -G Ninja llvm \
             -DCMAKE_ASM_COMPILER_TARGET=#{CREW_TARGET} \
             -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_C_COMPILER=$(which clang) \
@@ -169,7 +169,7 @@ class Llvm17_build < Package
     @counter = 1
     @counter_max = 20
     loop do
-      break if Kernel.system "mold -run #{CREW_NINJA} -C builddir -j #{CREW_NPROC}"
+      break if Kernel.system "#{CREW_NINJA} -C builddir -j #{CREW_NPROC}"
 
       puts "Make iteration #{@counter} of #{@counter_max}...".orange
 
diff --git a/packages/llvm18_build.rb b/packages/llvm18_build.rb
index 44d63a1a0..08c7ed900 100644
--- a/packages/llvm18_build.rb
+++ b/packages/llvm18_build.rb
@@ -124,7 +124,7 @@ class Llvm18_build < Package
         gnuc_lib=#{CREW_LIB_PREFIX}/gcc/${machine}/${version}
         clang++ -fPIC -rtlib=compiler-rt -stdlib=libc++ -cxx-isystem ${cxx_sys} -I ${cxx_inc} -B ${gnuc_lib} -L ${gnuc_lib} "$@"
       CLCPLUSPLUS_EOF
-      system "mold -run cmake -B builddir -G Ninja llvm \
+      system "cmake -B builddir -G Ninja llvm \
             -DCMAKE_ASM_COMPILER_TARGET=#{CREW_TARGET} \
             -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_C_COMPILER=$(which clang) \
@@ -172,7 +172,7 @@ class Llvm18_build < Package
     @counter = 1
     @counter_max = 20
     loop do
-      break if Kernel.system "mold -run #{CREW_NINJA} -C builddir -j #{CREW_NPROC}"
+      break if Kernel.system "#{CREW_NINJA} -C builddir -j #{CREW_NPROC}"
 
       puts "Make iteration #{@counter} of #{@counter_max}...".orange
 
diff --git a/packages/llvm19_build.rb b/packages/llvm19_build.rb
index 0b4e03580..9c8c68d2d 100644
--- a/packages/llvm19_build.rb
+++ b/packages/llvm19_build.rb
@@ -119,7 +119,7 @@ class Llvm19_build < Package
         gnuc_lib=#{CREW_LIB_PREFIX}/gcc/${machine}/${version}
         clang++ -fPIC -rtlib=compiler-rt -stdlib=libc++ -cxx-isystem ${cxx_sys} -I ${cxx_inc} -B ${gnuc_lib} -L ${gnuc_lib} "$@"
       CLCPLUSPLUS_EOF
-      system "mold -run cmake -B builddir -G Ninja llvm \
+      system "cmake -B builddir -G Ninja llvm \
             -DCMAKE_ASM_COMPILER_TARGET=#{CREW_TARGET} \
             -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_C_COMPILER=$(which clang) \
@@ -157,7 +157,7 @@ class Llvm19_build < Package
     @counter = 1
     @counter_max = 20
     loop do
-      break if Kernel.system "mold -run #{CREW_NINJA} -C builddir -j #{CREW_NPROC}"
+      break if Kernel.system "#{CREW_NINJA} -C builddir -j #{CREW_NPROC}"
 
       puts "Make iteration #{@counter} of #{@counter_max}...".orange
 
diff --git a/packages/llvm20_build.rb b/packages/llvm20_build.rb
index 129cff25f..deb5b3de9 100644
--- a/packages/llvm20_build.rb
+++ b/packages/llvm20_build.rb
@@ -119,7 +119,7 @@ class Llvm20_build < Package
         gnuc_lib=#{CREW_LIB_PREFIX}/gcc/${machine}/${version}
         clang++ -fPIC -rtlib=compiler-rt -stdlib=libc++ -cxx-isystem ${cxx_sys} -I ${cxx_inc} -B ${gnuc_lib} -L ${gnuc_lib} "$@"
       CLCPLUSPLUS_EOF
-      system "mold -run cmake -B builddir -G Ninja llvm \
+      system "cmake -B builddir -G Ninja llvm \
             -DCMAKE_ASM_COMPILER_TARGET=#{CREW_TARGET} \
             -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_C_COMPILER=$(which clang) \
@@ -157,7 +157,7 @@ class Llvm20_build < Package
     @counter = 1
     @counter_max = 20
     loop do
-      break if Kernel.system "mold -run #{CREW_NINJA} -C builddir -j #{CREW_NPROC}"
+      break if Kernel.system "#{CREW_NINJA} -C builddir -j #{CREW_NPROC}"
 
       puts "Make iteration #{@counter} of #{@counter_max}...".orange
 
diff --git a/packages/luajit_lgi.rb b/packages/luajit_lgi.rb
index 5093d1210..2b9d472ec 100644
--- a/packages/luajit_lgi.rb
+++ b/packages/luajit_lgi.rb
@@ -37,7 +37,7 @@ class Luajit_lgi < Package
     # -Dtests=false \
     # builddir"
     # system 'meson configure --no-pager builddir'
-    # system 'mold -run samu -C builddir'
+    # system 'samu -C builddir'
   end
 
   def self.install
diff --git a/packages/mediainfo.rb b/packages/mediainfo.rb
index e938ca671..8b54b77e1 100644
--- a/packages/mediainfo.rb
+++ b/packages/mediainfo.rb
@@ -27,7 +27,7 @@ class Mediainfo < Package
   end
 
   def self.build
-    system "mold -run ./CLI_Compile.sh #{CREW_CONFIGURE_OPTIONS}"
+    system "./CLI_Compile.sh #{CREW_CONFIGURE_OPTIONS}"
   end
 
   def self.install
diff --git a/packages/nano.rb b/packages/nano.rb
index c5e7276bf..1809cb417 100644
--- a/packages/nano.rb
+++ b/packages/nano.rb
@@ -1,9 +1,9 @@
-require 'package'
+require 'buildsystems/autotools'
 
-class Nano < Package
+class Nano < Autotools
   description 'Nano\'s ANOther editor, an enhanced free Pico clone.'
   homepage 'https://www.nano-editor.org/'
-  version '8.3'
+  version '8.4'
   license 'GPL-3'
   compatibility 'all'
   source_url "https://nano-editor.org/dist/v8/nano-#{version}.tar.xz"
@@ -11,10 +11,10 @@ class Nano < Package
   binary_compression 'tar.zst'
 
   binary_sha256({
-    aarch64: '05f552ef37e31db78a85fa7fa67e5f1163798baed534f5ea18eb49b1dd7e3225',
-     armv7l: '05f552ef37e31db78a85fa7fa67e5f1163798baed534f5ea18eb49b1dd7e3225',
-       i686: 'b741219876a649f8dbe992031f3c1aa6b1199370b31f9da6cb336c44c04d6c33',
-     x86_64: '4335734d6c70c77a1844e2a5f5e3b02e739560d67368bd620c79eb1115b5b341'
+    aarch64: 'afa071654d544a9f11f9a37af985af8c3a4d11468d85c9242a83b60b8cf15541',
+     armv7l: 'afa071654d544a9f11f9a37af985af8c3a4d11468d85c9242a83b60b8cf15541',
+       i686: 'e8de44caf4f82ddf66b8b54e547c542ea16b9b36f11d81458f0dd3882f9f4601',
+     x86_64: '4d4b7ea84e6835f931fccc71cfa095ebe78ef05e0315afb9bfd443dd870dfc37'
   })
 
   depends_on 'filecmd' # R
@@ -22,10 +22,7 @@ class Nano < Package
   depends_on 'ncurses' # R
   depends_on 'zlib' # R
 
-  def self.build
-    system "mold -run \
-      ./configure #{CREW_CONFIGURE_OPTIONS} \
-      --enable-browser \
+  configure_options '--enable-browser \
       --enable-color \
       --enable-comment \
       --enable-extra \
@@ -46,8 +43,9 @@ class Nano < Package
       --enable-utf8 \
       --enable-wordcomp \
       --enable-wrapping \
-      --enable-year2038"
-    system 'make'
+      --enable-year2038'
+
+  configure_build_extras do
     open('nanorc', 'w') do |f|
       f << "set constantshow\n"
       f << "set fill 72\n"
@@ -62,8 +60,7 @@ class Nano < Package
     end
   end
 
-  def self.install
-    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install-strip'
+  configure_install_extras do
     FileUtils.install 'nanorc', "#{CREW_DEST_HOME}/.nanorc", mode: 0o644
   end
 
diff --git a/packages/openh264.rb b/packages/openh264.rb
index 447e75c34..e6ca8b088 100644
--- a/packages/openh264.rb
+++ b/packages/openh264.rb
@@ -25,7 +25,7 @@ class Openh264 < Package
   depends_on 'nasm' => :build
 
   def self.build
-    system "mold -run meson setup #{CREW_MESON_OPTIONS} \
+    system "meson setup #{CREW_MESON_OPTIONS} \
       -Dtests=disabled \
       builddir"
     system 'meson configure --no-pager builddir'
diff --git a/packages/openmp.rb b/packages/openmp.rb
index 4604f2a53..74595e747 100644
--- a/packages/openmp.rb
+++ b/packages/openmp.rb
@@ -72,7 +72,7 @@ class Openmp < Package
       -DOPENMP_LIBDIR_SUFFIX=#{CREW_LIB_SUFFIX} \
       -DPYTHON_EXECUTABLE=$(which python3) \
       -Wno-dev"
-    system "mold -run #{CREW_NINJA} -C builddir"
+    system "#{CREW_NINJA} -C builddir"
   end
 
   def self.install
diff --git a/packages/openssl.rb b/packages/openssl.rb
index 023744af9..00d7445c5 100644
--- a/packages/openssl.rb
+++ b/packages/openssl.rb
@@ -46,7 +46,7 @@ class Openssl < Package
     system "PATH=#{CREW_LIB_PREFIX}/ccache/bin:#{CREW_PREFIX}/bin:/usr/bin:/bin \
       CFLAGS=\"#{@ARCH_C_LTO_FLAGS}\" CXXFLAGS=\"#{@ARCH_CXX_LTO_FLAGS}\" \
       LDFLAGS=\"#{@ARCH_LDFLAGS}\" \
-      mold -run ./Configure --prefix=#{CREW_PREFIX} \
+      ./Configure --prefix=#{CREW_PREFIX} \
       --libdir=#{ARCH_LIB} \
       --openssldir=#{CREW_PREFIX}/etc/ssl \
       #{@openssl_configure_target} #{@no_tests_target}"
diff --git a/packages/openssl111.rb b/packages/openssl111.rb
index 8a2830127..a7ee2f358 100644
--- a/packages/openssl111.rb
+++ b/packages/openssl111.rb
@@ -46,7 +46,7 @@ class Openssl111 < Package
     system "PATH=#{CREW_LIB_PREFIX}/ccache/bin:#{CREW_PREFIX}/bin:/usr/bin:/bin \
       CFLAGS=\"#{@ARCH_C_LTO_FLAGS}\" CXXFLAGS=\"#{@ARCH_CXX_LTO_FLAGS}\" \
       LDFLAGS=\"#{@ARCH_LDFLAGS}\" \
-      mold -run ./Configure --prefix=#{CREW_PREFIX} \
+      ./Configure --prefix=#{CREW_PREFIX} \
       --libdir=#{CREW_LIB_PREFIX} \
       --openssldir=#{CREW_PREFIX}/etc/ssl \
       #{@openssl_configure_target}"
diff --git a/packages/opus.rb b/packages/opus.rb
index 5470f8f38..8ece99b3d 100644
--- a/packages/opus.rb
+++ b/packages/opus.rb
@@ -34,7 +34,7 @@ class Opus < Package
       -Dtests=disabled \
       builddir"
     system 'meson configure --no-pager builddir'
-    system "mold -run #{CREW_NINJA} -C builddir"
+    system "#{CREW_NINJA} -C builddir"
   end
 
   def self.install
diff --git a/packages/opusfile.rb b/packages/opusfile.rb
index 54e16ff51..225da72e3 100644
--- a/packages/opusfile.rb
+++ b/packages/opusfile.rb
@@ -37,7 +37,7 @@ class Opusfile < Package
   end
 
   def self.build
-    system "mold -run cmake -B builddir #{CREW_CMAKE_OPTIONS} \
+    system "cmake -B builddir #{CREW_CMAKE_OPTIONS} \
         -DBUILD_SHARED_LIBS=ON \
         -Wno-dev \
         -G Ninja"
diff --git a/packages/pax_utils.rb b/packages/pax_utils.rb
index 3edcf4bdd..8e44111d2 100644
--- a/packages/pax_utils.rb
+++ b/packages/pax_utils.rb
@@ -35,7 +35,7 @@ class Pax_utils < Package
             -Duse_seccomp=true \
             builddir"
     system 'meson configure --no-pager builddir'
-    system "mold -run #{CREW_NINJA} -C builddir"
+    system "#{CREW_NINJA} -C builddir"
   end
 
   def self.check
diff --git a/packages/peek.rb b/packages/peek.rb
index e6dba8818..cd7d6f63e 100644
--- a/packages/peek.rb
+++ b/packages/peek.rb
@@ -26,7 +26,7 @@ class Peek < Package
   depends_on 'gcc_lib' # R
 
   def self.build
-    system "mold -run meson setup #{CREW_MESON_OPTIONS} \
+    system "meson setup #{CREW_MESON_OPTIONS} \
       -Dbuild-tests=false \
       builddir"
     system 'meson configure --no-pager builddir'
diff --git a/packages/perl.rb b/packages/perl.rb
index d2716ddc4..80c18ab63 100644
--- a/packages/perl.rb
+++ b/packages/perl.rb
@@ -28,7 +28,7 @@ class Perl < Package
     # Install manual files into #{CREW_PREFIX}/share/man/man* even if groff is not installed.
     system "AR=gcc-ar RANLIB=gcc-ranlib NM=gcc-nm \
       BUILD_ZLIB=False BUILD_BZIP2=0 \
-      mold -run ./Configure \
+      ./Configure \
       -de \
       -Dprefix=#{CREW_PREFIX} \
       -Dvendorprefix=#{CREW_PREFIX} \
diff --git a/packages/php74.rb b/packages/php74.rb
index 3aab24d85..651ba71ac 100644
--- a/packages/php74.rb
+++ b/packages/php74.rb
@@ -93,7 +93,7 @@ class Php74 < Package
   end
 
   def self.build
-    system "CFLAGS='-pipe' mold -run ./configure \
+    system "CFLAGS='-pipe' ./configure \
        --prefix=#{CREW_PREFIX} \
        --docdir=#{CREW_PREFIX}/doc \
        --infodir=#{CREW_PREFIX}/info \
@@ -145,7 +145,7 @@ class Php74 < Package
        --with-xmlrpc \
        --with-xsl \
        --with-zip"
-    system 'mold -run make'
+    system 'make'
   end
 
   def self.check
diff --git a/packages/php80.rb b/packages/php80.rb
index 17a87b3c2..84b659f0c 100644
--- a/packages/php80.rb
+++ b/packages/php80.rb
@@ -93,7 +93,7 @@ class Php80 < Package
   end
 
   def self.build
-    system "CFLAGS='-pipe' mold -run ./configure \
+    system "CFLAGS='-pipe' ./configure \
        --prefix=#{CREW_PREFIX} \
        --docdir=#{CREW_PREFIX}/doc \
        --infodir=#{CREW_PREFIX}/info \
@@ -147,7 +147,7 @@ class Php80 < Package
        --with-zip \
        --with-ffi \
        --with-libedit"
-    system 'mold -run make'
+    system 'make'
   end
 
   def self.check
diff --git a/packages/php81.rb b/packages/php81.rb
index 8a2ca0927..4419928af 100644
--- a/packages/php81.rb
+++ b/packages/php81.rb
@@ -93,7 +93,7 @@ class Php81 < Package
   end
 
   def self.build
-    system "CFLAGS='-pipe' mold -run ./configure \
+    system "CFLAGS='-pipe' ./configure \
        --prefix=#{CREW_PREFIX} \
        --docdir=#{CREW_PREFIX}/doc \
        --infodir=#{CREW_PREFIX}/info \
@@ -147,7 +147,7 @@ class Php81 < Package
        --with-zip \
        --with-ffi \
        --with-libedit"
-    system 'mold -run make'
+    system 'make'
   end
 
   def self.check
diff --git a/packages/php82.rb b/packages/php82.rb
index 4a6d7ea2b..325b1c65f 100644
--- a/packages/php82.rb
+++ b/packages/php82.rb
@@ -95,7 +95,7 @@ class Php82 < Package
   end
 
   def self.build
-    system "mold -run ./configure \
+    system "./configure \
        --prefix=#{CREW_PREFIX} \
        --docdir=#{CREW_PREFIX}/doc \
        --infodir=#{CREW_PREFIX}/info \
diff --git a/packages/poppler.rb b/packages/poppler.rb
index 46d6bb9ad..e409a71ab 100644
--- a/packages/poppler.rb
+++ b/packages/poppler.rb
@@ -37,7 +37,7 @@ class Poppler < Package
   depends_on 'zlib' # R
 
   def self.build
-    system "mold -run cmake -B builddir #{CREW_CMAKE_OPTIONS} \
+    system "cmake -B builddir #{CREW_CMAKE_OPTIONS} \
         -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
         -Wno-dev \
         -G Ninja"
diff --git a/packages/python3.rb b/packages/python3.rb
index a79e48288..363e6fcbb 100644
--- a/packages/python3.rb
+++ b/packages/python3.rb
@@ -93,7 +93,7 @@ class Python3 < Package
           --with-tzpath=#{CREW_PREFIX}/share/zoneinfo \
           --with-libc= \
           --enable-shared"
-      system "MAKEFLAGS=-j#{CREW_NPROC} mold -run make"
+      system "MAKEFLAGS=-j#{CREW_NPROC} make"
       File.write 'python_config_env', <<~PYTHON_CONFIG_EOF
         # Force use of python3 over python2.7 in packages which check the variable to set the python used.
         PYTHON=python3
diff --git a/packages/qemu.rb b/packages/qemu.rb
index 3d364284b..34a011a18 100644
--- a/packages/qemu.rb
+++ b/packages/qemu.rb
@@ -80,7 +80,7 @@ class Qemu < Package
   def self.build
     FileUtils.mkdir_p 'build'
     Dir.chdir 'build' do
-      system "mold -run ../configure #{CREW_CONFIGURE_OPTIONS.sub(/--target.*/, '').gsub('vfpv3-d16', 'neon').gsub('--disable-dependency-tracking', '').sub(/--program-prefix.*?(?=\s|$)/, '').sub(/--program-suffix.*?(?=\s|$)/, '')} \
+      system "../configure #{CREW_CONFIGURE_OPTIONS.sub(/--target.*/, '').gsub('vfpv3-d16', 'neon').gsub('--disable-dependency-tracking', '').sub(/--program-prefix.*?(?=\s|$)/, '').sub(/--program-suffix.*?(?=\s|$)/, '')} \
         --enable-kvm \
         --enable-lto"
       @counter = 1
diff --git a/packages/ruby.rb b/packages/ruby.rb
index ee5a3d9ea..229d9ee6b 100644
--- a/packages/ruby.rb
+++ b/packages/ruby.rb
@@ -38,7 +38,7 @@ class Ruby < Package
       RUBY_TRY_LDFLAGS='stack_protector=no' \
       optflags='-flto=auto -fuse-ld=#{CREW_LINKER}' \
       LD=#{CREW_LINKER} \
-      mold -run ./configure #{CREW_CONFIGURE_OPTIONS} \
+      ./configure #{CREW_CONFIGURE_OPTIONS} \
       --enable-shared \
       #{ARCH == 'x86_64' ? '--enable-yjit' : ''} \
       --disable-fortify-source"
diff --git a/packages/sassc.rb b/packages/sassc.rb
index a55119041..1fc97c351 100644
--- a/packages/sassc.rb
+++ b/packages/sassc.rb
@@ -24,7 +24,7 @@ class Sassc < Package
   def self.build
     system 'autoreconf -i'
     system "./configure #{CREW_CONFIGURE_OPTIONS}"
-    system 'mold -run make'
+    system 'make'
   end
 
   def self.install
diff --git a/packages/slang.rb b/packages/slang.rb
index 596e79133..548eca0f7 100644
--- a/packages/slang.rb
+++ b/packages/slang.rb
@@ -24,7 +24,7 @@ class Slang < Package
   depends_on 'gcc_lib' # R
 
   def self.build
-    system "mold -run ./configure #{CREW_CONFIGURE_OPTIONS} --without-x"
+    system "./configure #{CREW_CONFIGURE_OPTIONS} --without-x"
 
     # force to compile in sequential since slang Makefile doesn't work in parallel
     system 'make', '-j1'
diff --git a/packages/sommelier.rb b/packages/sommelier.rb
index b9de7d641..83833ad13 100644
--- a/packages/sommelier.rb
+++ b/packages/sommelier.rb
@@ -114,7 +114,7 @@ class Sommelier < Package
 
       system <<~BUILD
         env CC=clang CXX=clang++ \
-          mold -run meson setup #{CREW_MESON_OPTIONS.gsub('-ffat-lto-objects', '')} \
+          meson setup #{CREW_MESON_OPTIONS.gsub('-ffat-lto-objects', '')} \
           -Dcommit_loop_fix=true \
           -Db_asneeded=false \
           -Db_lto=true \
@@ -127,7 +127,7 @@ class Sommelier < Package
       BUILD
 
       system 'meson configure --no-pager builddir'
-      system "mold -run #{CREW_NINJA} -C builddir"
+      system "#{CREW_NINJA} -C builddir"
 
       FileUtils.mkdir_p 'builddir'
       Dir.chdir('builddir') do
diff --git a/packages/spacefm.rb b/packages/spacefm.rb
index 087e64aba..8f5d868e7 100644
--- a/packages/spacefm.rb
+++ b/packages/spacefm.rb
@@ -55,7 +55,7 @@ class Spacefm < Package
   end
 
   def self.build
-    system "mold -run ./configure #{CREW_CONFIGURE_OPTIONS} \
+    system "./configure #{CREW_CONFIGURE_OPTIONS} \
       --with-gtk3 \
       --disable-maintainer-mode"
     system 'make'
diff --git a/packages/taglib.rb b/packages/taglib.rb
index cba4f8de4..9a00f03fb 100644
--- a/packages/taglib.rb
+++ b/packages/taglib.rb
@@ -21,7 +21,7 @@ class Taglib < Package
   depends_on 'cppunit' => :build
 
   def self.build
-    system "mold -run cmake -B builddir #{CREW_CMAKE_OPTIONS} \
+    system "cmake -B builddir #{CREW_CMAKE_OPTIONS} \
             -G Ninja"
     system "#{CREW_NINJA} -C builddir || ( sed -i 's/-fno-lto//g' builddir/taglib/build.ninja && #{CREW_NINJA} -C builddir)"
   end
diff --git a/packages/trousers.rb b/packages/trousers.rb
index 8cd6d60cb..1f6880876 100644
--- a/packages/trousers.rb
+++ b/packages/trousers.rb
@@ -23,7 +23,7 @@ class Trousers < Package
 
   def self.build
     system './bootstrap.sh'
-    system "mold -run ./configure \
+    system "./configure \
       #{CREW_CONFIGURE_OPTIONS} \
       --with-gui=none"
     system 'make'
diff --git a/packages/vala.rb b/packages/vala.rb
index 673e2dcca..07ee5a1fe 100644
--- a/packages/vala.rb
+++ b/packages/vala.rb
@@ -36,12 +36,12 @@ class Vala < Package
       system 'git checkout b2beeaccdf2307ced172646c2ada9765e1747b28'
       system 'touch */*.stamp'
       system 'autoreconf -fi'
-      system "VALAC=/no-valac mold -run ./configure --prefix=#{Dir.pwd}/../bootstrap_install"
+      system "VALAC=/no-valac ./configure --prefix=#{Dir.pwd}/../bootstrap_install"
       system 'make'
       system 'make install'
     end
 
-    system "VALAC=#{Dir.pwd}/bootstrap_install/bin/valac mold -run ./autogen.sh \
+    system "VALAC=#{Dir.pwd}/bootstrap_install/bin/valac ./autogen.sh \
       #{CREW_CONFIGURE_OPTIONS} \
       --disable-maintainer-mode \
       --disable-valadoc"
diff --git a/packages/webkit2gtk_4_1.rb b/packages/webkit2gtk_4_1.rb
index 46750b87f..e80d73b23 100644
--- a/packages/webkit2gtk_4_1.rb
+++ b/packages/webkit2gtk_4_1.rb
@@ -114,7 +114,7 @@ class Webkit2gtk_4_1 < Package
     @counter = 1
     @counter_max = 20
     loop do
-      break if Kernel.system "mold -run #{CREW_NINJA} -C builddir -j #{CREW_NPROC}"
+      break if Kernel.system "#{CREW_NINJA} -C builddir -j #{CREW_NPROC}"
 
       puts "Make iteration #{@counter} of #{@counter_max}...".orange