diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-12-31 09:51:58 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-12-31 09:53:49 +0100 |
commit | 1fcd92ce923d33ab3d8c0b6c6d42473b135f114b (patch) | |
tree | c0f696c1c2d3ff82067d891ee25bb4f44af54880 /pkgs/development/compilers | |
parent | 4d2b7638173afb4c0f0c12a43654bcff5c9500ab (diff) | |
parent | ab3a12ed7ee0de4d247a8017151a1bf01829f6f7 (diff) | |
download | nixlib-1fcd92ce923d33ab3d8c0b6c6d42473b135f114b.tar nixlib-1fcd92ce923d33ab3d8c0b6c6d42473b135f114b.tar.gz nixlib-1fcd92ce923d33ab3d8c0b6c6d42473b135f114b.tar.bz2 nixlib-1fcd92ce923d33ab3d8c0b6c6d42473b135f114b.tar.lz nixlib-1fcd92ce923d33ab3d8c0b6c6d42473b135f114b.tar.xz nixlib-1fcd92ce923d33ab3d8c0b6c6d42473b135f114b.tar.zst nixlib-1fcd92ce923d33ab3d8c0b6c6d42473b135f114b.zip |
Merge branch 'master' into staging
A few thousand rebuilds from master, again. Hydra: ?compare=1422362
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/gcc/4.5/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/4.8/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.4/clang.nix | 1 |
3 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index a312276b33e4..8f29d5f2cb14 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -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; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 91daeadba707..a28ad871ead2 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -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; diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index 741ecc3856f8..10510c750354 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation { # GCC_INSTALL_PREFIX points here, so just use it even though it may not # actually be a gcc gcc = stdenv.cc.cc; + hardeningUnsupportedFlags = [ "stackprotector" ]; }; enableParallelBuilding = true; |