summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorJohn Ericson <Ericson2314@yahoo.com>2017-12-30 23:25:43 -0500
committerGitHub <noreply@github.com>2017-12-30 23:25:43 -0500
commit64965e8224021b8d449de906f6e8b5a4b5b2c5d9 (patch)
treed02de6728884c0720fc50be78221c2f484771dec /pkgs/top-level
parent60a133f9d0702978e15b776e74b73b10cfc47157 (diff)
parent6d9769663d3719b1d388644e9edb55771b5c84f0 (diff)
downloadnixlib-64965e8224021b8d449de906f6e8b5a4b5b2c5d9.tar
nixlib-64965e8224021b8d449de906f6e8b5a4b5b2c5d9.tar.gz
nixlib-64965e8224021b8d449de906f6e8b5a4b5b2c5d9.tar.bz2
nixlib-64965e8224021b8d449de906f6e8b5a4b5b2c5d9.tar.lz
nixlib-64965e8224021b8d449de906f6e8b5a4b5b2c5d9.tar.xz
nixlib-64965e8224021b8d449de906f6e8b5a4b5b2c5d9.tar.zst
nixlib-64965e8224021b8d449de906f6e8b5a4b5b2c5d9.zip
Merge pull request #29483 from veprbl/hardening_unsupported_flags
cc-wrapper: allow compilers to specify unsupported hardening modes
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix8
1 files changed, 1 insertions, 7 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26ad6c3c7e00..bd50a01dc348 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5543,13 +5543,7 @@ with pkgs;
   clang_38 = llvmPackages_38.clang;
   clang_37 = llvmPackages_37.clang;
   clang_35 = wrapCC llvmPackages_35.clang;
-  clang_34 = (wrapCC llvmPackages_34.clang).override {
-    # Default cc-wrapper's hardening flags don't work with clang-3.4,
-    # so just remove it entirely for this wrapper.
-    extraBuildCommands = ''
-    :> $out/nix-support/add-hardening.sh
-    '';
-  };
+  clang_34 = wrapCC llvmPackages_34.clang;
 
   clang-tools = callPackage ../development/tools/clang-tools { };