From cc45a96aea5609d3cc19460c5edf02f631df539e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 1 Sep 2017 12:08:25 -0500 Subject: [PATCH] clang_34: Disable hardening bits (#28543) --- pkgs/top-level/all-packages.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2993b0647e..b743b7dcbe9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5242,7 +5242,13 @@ with pkgs; clang_38 = llvmPackages_38.clang; clang_37 = llvmPackages_37.clang; clang_35 = wrapCC llvmPackages_35.clang; - clang_34 = wrapCC llvmPackages_34.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-tools = callPackage ../development/tools/clang-tools { };