Unverified Commit cce25db6 authored by kirillrdy's avatar kirillrdy Committed by GitHub
Browse files

ruby: re-enable yjit, and fix, on cross (#461684)

parents 32caa494 c286dcb0

pkgs/development/interpreters/ruby/default.nix

+8 −5
Original line number Diff line number Diff line
@@ -57,13 +57,9 @@ let 
    }:

    let

      ver = version;

      isCross = stdenv.buildPlatform != stdenv.hostPlatform;

      # https://github.com/ruby/ruby/blob/v3_2_2/yjit.h#L21

      yjitSupported =

        !isCross

        && (

          stdenv.hostPlatform.isx86_64 || (!stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isAarch64)

        );

        stdenv.hostPlatform.isx86_64 || (!stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isAarch64);

      rubyDrv = lib.makeOverridable (

        {

          stdenv,
@@ -181,6 +177,13 @@ let 
          ];

          propagatedBuildInputs = op jemallocSupport jemalloc;



          env = lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform && yjitSupport) {

            # The ruby build system will use a bare `rust` command by default for its rust.

            # We can use the Nixpkgs rust wrapper to work around the fact that our Rust builds

            # for cross-compilation output for the build target by default.

            NIX_RUSTFLAGS = "--target ${stdenv.hostPlatform.rust.rustcTargetSpec}";

          };



          enableParallelBuilding = true;

          # /build/ruby-2.7.7/lib/fileutils.rb:882:in `chmod':

          #   No such file or directory @ apply2files - ...-ruby-2.7.7-devdoc/share/ri/2.7.0/system/ARGF/inspect-i.ri (Errno::ENOENT)