summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2020-06-11 12:05:14 -0500
committerMatthew Bauer <mjbauer95@gmail.com>2020-06-11 12:05:14 -0500
commit0daaed87309854e62424bf618380e146da7ad236 (patch)
tree03b87c7581ae3ca42c9f0d9d70deabab7d28df78 /pkgs/development
parenta5a52e8c73ed2bb52b5fcb0bc93a77769412e72e (diff)
downloadnixpkgs-0daaed87309854e62424bf618380e146da7ad236.tar
nixpkgs-0daaed87309854e62424bf618380e146da7ad236.tar.gz
nixpkgs-0daaed87309854e62424bf618380e146da7ad236.tar.bz2
nixpkgs-0daaed87309854e62424bf618380e146da7ad236.tar.lz
nixpkgs-0daaed87309854e62424bf618380e146da7ad236.tar.xz
nixpkgs-0daaed87309854e62424bf618380e146da7ad236.tar.zst
nixpkgs-0daaed87309854e62424bf618380e146da7ad236.zip
Revert "Merge pull request #89726 from doronbehar/ruby-gcc-ref"
This reverts commit 6590c338500a8e2939f0fd0bc21e23ab3dd41b91, reversing
changes made to d659f968ba32395c7e2fce3b87b3047c7efd8d03.
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/interpreters/ruby/default.nix5
1 files changed, 0 insertions, 5 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