public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #89726 from doronbehar/ruby-gcc-ref 

rubyMinimal: don't reference stdenv.cc
This commit is contained in:
Matthew Bauer 2020-06-11 11:01:39 -05:00 committed by GitHub
parent d659f968ba bb8ea13840
commit 6590c33850
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/interpreters/ruby/default.nix
View File

@ -37,6 +37,7 @@ let
, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
, useRailsExpress ? true , useRailsExpress ? true
, rubygemsSupport ? true , rubygemsSupport ? true
, JitSupport ? true
, zlib, zlibSupport ? true , zlib, zlibSupport ? true
, openssl, opensslSupport ? true , openssl, opensslSupport ? true
, gdbm, gdbmSupport ? true , gdbm, gdbmSupport ? true
@ -118,6 +119,7 @@ let
configureFlags = ["--enable-shared" "--enable-pthread" "--with-soname=ruby_${tag}"] configureFlags = ["--enable-shared" "--enable-pthread" "--with-soname=ruby_${tag}"]
++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby" ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
++ op (!JitSupport) "--disable-jit-support"
++ op (!docSupport) "--disable-install-doc" ++ op (!docSupport) "--disable-install-doc"
++ ops stdenv.isDarwin [ ++ ops stdenv.isDarwin [
# on darwin, we have /usr/include/tk.h -- so the configure script detects # on darwin, we have /usr/include/tk.h -- so the configure script detects
@ -155,6 +157,9 @@ let
${removeReferencesTo}/bin/remove-references-to \ ${removeReferencesTo}/bin/remove-references-to \
-t ${stdenv.cc} \ -t ${stdenv.cc} \
$out/lib/libruby* $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 # Bundler tries to create this directory

2
pkgs/top-level/all-packages.nix
View File

@ -9788,6 +9788,8 @@ in
rubyMinimal = ruby.override { rubyMinimal = ruby.override {
# gem support is minimal overhead # gem support is minimal overhead
rubygemsSupport = true; rubygemsSupport = true;
removeReferenceToCC = true;
JitSupport = false;
useRailsExpress = false; useRailsExpress = false;
zlibSupport = false; zlibSupport = false;
opensslSupport = false; opensslSupport = false;