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

GNU Guile 2.0: Fix cross-GNU builds.

Browse Source 
svn path=/nixpkgs/trunk/; revision=34029
This commit is contained in:
Ludovic Courtès 2012-05-09 13:42:46 +00:00
parent 5930e47068
commit c1dd4327dc
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/interpreters/guile/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring { fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
, libffi, gawk, makeWrapper, coverageAnalysis ? null }: , libffi, gawk, makeWrapper, coverageAnalysis ? null, gnu ? null }:
# Do either a coverage analysis build or a standard build. # Do either a coverage analysis build or a standard build.
(if coverageAnalysis != null (if coverageAnalysis != null
@ -48,6 +48,15 @@
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
crossAttrs.preConfigure =
stdenv.lib.optionalString (stdenv.cross.config == "i586-pc-gnu")
# 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 = { meta = {
description = "GNU Guile 2.0, an embeddable Scheme implementation"; description = "GNU Guile 2.0, an embeddable Scheme implementation";