Author: viric
Date: 2010-07-04 11:10:58 +0000 (Sun, 04 Jul 2010)
New Revision: 22449

You can view the changes in this commit at:
   https://svn.nixos.org/viewvc/nix?rev=22449&view=rev

Modified:
   nixpkgs/trunk/pkgs/development/compilers/path64/default.nix

Log:
Quite fixing the path64 compiler. It builds programs in C even finding the libc 
header files.

Nevertheless, although all stages work, pathcc keeps on saying "INTERNAL ERROR 
happened",
but resultign binaries work fine.

It needs some upstream fixing - they have all too much hardcoded to /usr, for 
example.

Changes:

Modified: nixpkgs/trunk/pkgs/development/compilers/path64/default.nix
===================================================================
--- nixpkgs/trunk/pkgs/development/compilers/path64/default.nix 2010-07-04 
11:10:54 UTC (rev 22448)
+++ nixpkgs/trunk/pkgs/development/compilers/path64/default.nix 2010-07-04 
11:10:58 UTC (rev 22449)
@@ -1,5 +1,7 @@
 {stdenv, fetchgit, perl, flex, bison, gmp, mpfr, cmake}:
 
+assert stdenv.system == "x86_64-linux";
+
 stdenv.mkDerivation {
   name = "path64-2010-07-02";
 
@@ -9,15 +11,19 @@
     sha256 = 
"fa1320959e1131557d5f82e98f4621a222ec45e1d6e0e7f271d2c13de4fd0dd1";
   };
 
-  cmakeFlags = "
+  patchPhase = ''
+    sed -i s,/usr/bin/ld,$(type -P ld), src/driver/phases.c
+    sed -i 
s,/lib64/ld-linux-x86-64.so.2,${stdenv.glibc}/lib/ld-linux-x86-64.so.2, 
src/include/main_defs.h.in
+  '';
+
+  cmakeFlags = ''
     -DPATH64_ENABLE_HUGEPAGES=ON 
     -DPATH64_ENABLE_MATHLIBS=ON -DPATH64_ENABLE_OPENMP=ON 
     -DPATH64_ENABLE_PSCRUNTIME=OFF -DPSC_CRT_PATH=/usr/lib64 
     -DPATH64_ENABLE_PROFILING=OFF -DPATH64_ENABLE_TARGETS=x8664 
     -DCMAKE_BUILD_TYPE=Debug -DPATH64_ENABLE_FORTRAN=OFF
-  ";
+    -DPSC_CRT_PATH=${stdenv.glibc}/lib
+  '';
 
-  makeFlags = "-j4";
-
   buildInputs = [ perl flex bison gmp mpfr cmake ];
 }

_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to