diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 13:29:04 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 13:29:04 -0400 |
| commit | f40aa17933bc07d7913fd705b5f8ce50aab86782 (patch) | |
| tree | e34c79e6c3a09dc63011b44d877345f1a6b3bc78 /pkgs/development/interpreters/guile | |
| parent | d1c4260859efeef4347d007ef8ce9bea5703cd0f (diff) | |
| parent | 4ae207aea0164caee9c39b24177692ab4ef4dab4 (diff) | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/development/interpreters/guile')
| -rw-r--r-- | pkgs/development/interpreters/guile/2.0.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/interpreters/guile/default.nix | 9 |
2 files changed, 0 insertions, 18 deletions
diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index e670f145a5d3..b0eeb89ce431 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -93,15 +93,6 @@ setupHook = ./setup-hook-2.0.sh; - crossAttrs.preConfigure = - stdenv.lib.optionalString (hostPlatform.isHurd) - # On GNU, libgc depends on libpthread, but the cross linker doesn't - # know where to find libpthread, which leads to erroneous test failures - # in `configure', where `-pthread' and `-lpthread' aren't explicitly - # passed. So it needs some help (XXX). - "export LDFLAGS=-Wl,-rpath-link=${gnu.libpthreadCross}/lib"; - - meta = { description = "Embeddable Scheme implementation"; homepage = http://www.gnu.org/software/guile/; diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index f3b36ecd9403..196c899fcea9 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -89,15 +89,6 @@ setupHook = ./setup-hook-2.2.sh; - crossAttrs.preConfigure = - stdenv.lib.optionalString (hostPlatform.isHurd) - # On GNU, libgc depends on libpthread, but the cross linker doesn't - # know where to find libpthread, which leads to erroneous test failures - # in `configure', where `-pthread' and `-lpthread' aren't explicitly - # passed. So it needs some help (XXX). - "export LDFLAGS=-Wl,-rpath-link=${gnu.libpthreadCross}/lib"; - - meta = { description = "Embeddable Scheme implementation"; homepage = http://www.gnu.org/software/guile/; |