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/build-support/cc-wrapper | |
| 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/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 5d878d219f18..8de2366ff5f5 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -293,7 +293,7 @@ stdenv.mkDerivation { ## Hardening support ## - export hardening_unsupported_flags="" + export hardening_unsupported_flags="${builtins.concatStringsSep " " (cc.hardeningUnsupportedFlags or [])}" '' + optionalString hostPlatform.isCygwin '' |