Author: viric
Date: Thu May 24 21:45:49 2012
New Revision: 34231
URL: https://nixos.org/websvn/nix/?rev=34231&sc=1

Log:
Making gcc not build libgomp with uclibc, as it lacks '-ldl' in its checks and
I don't know how to add it.
This makes gcc build with uclibc.

Modified:
   nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/default.nix

Modified: nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/default.nix        Thu May 
24 21:45:18 2012        (r34230)
+++ nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/default.nix        Thu May 
24 21:45:49 2012        (r34231)
@@ -135,7 +135,10 @@
           # In any case, g++ linking is broken by default with shared libs,
           # unless adding "-lsupc++" to any linking command. I don't know why.
           " --disable-shared"
-          else
+          else (if cross.libc == "uclibc" then
+            # In uclibc cases, libgomp needs an additional '-ldl'
+            # and as I don't know how to pass it, I disable libgomp.
+            " --disable-libgomp" else "") +
           " --enable-threads=posix" +
           " --enable-nls" +
           " --disable-decimal-float") # No final libdecnumber (it may work 
only in 386)
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to