Revert "Merge pull request #89726 from doronbehar/ruby-gcc-ref"
This reverts commit6590c33850
, reversing changes made tod659f968ba
.
This commit is contained in:
parent
a5a52e8c73
commit
0daaed8730
@ -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
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user