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

Merge branch 'master' into staging

Browse Source 
A few thousand rebuilds from master, again.
Hydra: ?compare=1422362
This commit is contained in:
Vladimír Čunát
2017-12-31 09:53:49 +01:00
parent 4d2b763817 ab3a12ed7e
commit 1fcd92ce92
46 changed files with 2019 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/gcc/4.5/default.nix
+5 -2
View File
@@ -382,8 +382,11 @@ stdenv.mkDerivation ({
"-Wl,${libpthreadCross.TARGET_LDFLAGS}"
]);
passthru = { inherit langC langCC langAda langFortran langVhdl
enableMultilib version; isGNU = true; };
passthru = {
inherit langC langCC langAda langFortran langVhdl enableMultilib version;
isGNU = true;
hardeningUnsupportedFlags = [ "stackprotector" ];
};
enableParallelBuilding = !langAda;
pkgs/development/compilers/gcc/4.8/default.nix
+5 -2
View File
@@ -459,8 +459,11 @@ stdenv.mkDerivation ({
"-Wl,${libpthreadCross.TARGET_LDFLAGS}"
]);
passthru =
{ inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; };
passthru = {
inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version;
isGNU = true;
hardeningUnsupportedFlags = [ "stackprotector" ];
};
inherit enableParallelBuilding enableMultilib;