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

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster
2016-04-18 13:00:40 +00:00
parent 3e68106afd 0729f60697
commit d020caa5b2
1369 changed files with 35810 additions and 10571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/tinycc/default.nix
View File

@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
preConfigure = ''
configureFlagsArray+=("--elfinterp=$(cat $NIX_CC/nix-support/dynamic-linker)")
configureFlagsArray+=("--crtprefix=${stdenv.glibc}/lib")
configureFlagsArray+=("--sysincludepaths=${stdenv.glibc}/include:{B}/include")
configureFlagsArray+=("--libpaths=${stdenv.glibc}/lib")
configureFlagsArray+=("--crtprefix=${stdenv.glibc.out}/lib")
configureFlagsArray+=("--sysincludepaths=${stdenv.glibc.dev}/include:{B}/include")
configureFlagsArray+=("--libpaths=${stdenv.glibc.out}/lib")
'';
doCheck = true;