Author: ludo
Date: Tue Feb  1 08:04:08 2011
New Revision: 25741
URL: https://svn.nixos.org/websvn/nix/?rev=25741&sc=1

Log:
guile: Configure with `--disable-shared' on Cygwin.

Modified:
   hydra-config/gnu/trunk/guile/release.nix

Modified: hydra-config/gnu/trunk/guile/release.nix
==============================================================================
--- hydra-config/gnu/trunk/guile/release.nix    Mon Jan 31 18:58:49 2011        
(r25740)
+++ hydra-config/gnu/trunk/guile/release.nix    Tue Feb  1 08:04:08 2011        
(r25741)
@@ -65,7 +65,12 @@
           "--with-libgmp-prefix=${gmp}"
         ]
      ++ (stdenv.lib.optional (! (stdenv ? glibc))
-        "--with-libiconv-prefix=${libiconv}"));
+        "--with-libiconv-prefix=${libiconv}")
+
+     # Many shared libraries are missing on Cygwin, which prevents libtool
+     # from actually building the shared libguile.  So explicitly disable
+     # shared libraries so that tests relying on them are skipped.
+     ++ (stdenv.lib.optional (stdenv.isCygwin) "--disable-shared"));
 
   /* Return a name/value attribute set where the value is a function suitable
      as a Hydra build function.  */
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to