From 0daaed87309854e62424bf618380e146da7ad236 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 11 Jun 2020 12:05:14 -0500
Subject: [PATCH] Revert "Merge pull request #89726 from
 doronbehar/ruby-gcc-ref"

This reverts commit 6590c338500a8e2939f0fd0bc21e23ab3dd41b91, reversing
changes made to d659f968ba32395c7e2fce3b87b3047c7efd8d03.
---
 pkgs/development/interpreters/ruby/default.nix | 5 -----
 pkgs/top-level/all-packages.nix                | 2 --
 2 files changed, 7 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 1e6a81373bb..1756c13b53d 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -37,7 +37,6 @@ let
       , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
       , useRailsExpress ? true
       , rubygemsSupport ? true
-      , JitSupport ? true
       , zlib, zlibSupport ? true
       , openssl, opensslSupport ? true
       , gdbm, gdbmSupport ? true
@@ -119,7 +118,6 @@ let
 
         configureFlags = ["--enable-shared" "--enable-pthread" "--with-soname=ruby_${tag}"]
           ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
-          ++ op (!JitSupport) "--disable-jit-support"
           ++ op (!docSupport) "--disable-install-doc"
           ++ ops stdenv.isDarwin [
             # on darwin, we have /usr/include/tk.h -- so the configure script detects
@@ -157,9 +155,6 @@ let
               ${removeReferencesTo}/bin/remove-references-to \
                 -t ${stdenv.cc} \
                 $out/lib/libruby*
-              ${removeReferencesTo}/bin/remove-references-to \
-                -t ${stdenv.cc} \
-                $out/${passthru.libPath}/${stdenv.targetPlatform.system}/rbconfig.rb
             ''
           }
           # Bundler tries to create this directory
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 590c6a88f05..ed0aba3eca8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9788,8 +9788,6 @@ in
   rubyMinimal = ruby.override {
     # gem support is minimal overhead
     rubygemsSupport = true;
-    removeReferenceToCC = true;
-    JitSupport = false;
     useRailsExpress = false;
     zlibSupport = false;
     opensslSupport = false;