diff options
| author | Robin Gloster <mail@glob.in> | 2016-03-28 19:17:23 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-03-28 19:17:23 +0000 |
| commit | 7dea0e91acb14b64f7c941399360fcf3a783f552 (patch) | |
| tree | ae2d2817429d1a5ca54b382b6d90d7d10131b7ef | |
| parent | f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3 (diff) | |
| download | nixlib-7dea0e91acb14b64f7c941399360fcf3a783f552.tar nixlib-7dea0e91acb14b64f7c941399360fcf3a783f552.tar.gz nixlib-7dea0e91acb14b64f7c941399360fcf3a783f552.tar.bz2 nixlib-7dea0e91acb14b64f7c941399360fcf3a783f552.tar.lz nixlib-7dea0e91acb14b64f7c941399360fcf3a783f552.tar.xz nixlib-7dea0e91acb14b64f7c941399360fcf3a783f552.tar.zst nixlib-7dea0e91acb14b64f7c941399360fcf3a783f552.zip | |
gcc/isl: move bootstrap hardening flags to new bootstrap env
| -rw-r--r-- | pkgs/development/compilers/gcc/4.9/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/5/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/isl/0.11.1.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/isl/0.14.1.nix | 3 |
4 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index d4c8d018ff2b..02d48bc76f19 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -220,8 +220,7 @@ stdenv.mkDerivation ({ inherit patches; - # FIXME stackprotector needs gcc 4.9 in bootstrap tools - hardeningDisable = [ "format" "stackprotector" ]; + hardeningDisable = [ "format" ]; postPatch = if (stdenv.isGNU diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index ed872703db85..f0a0b8e34643 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -216,7 +216,8 @@ stdenv.mkDerivation ({ sha256 = "1ny4smkp5bzs3cp8ss7pl6lk8yss0d9m4av1mvdp72r1x695akxq"; }; - hardeningDisable = [ "format" ]; + # FIXME stackprotector needs gcc 4.9 in bootstrap tools + hardeningDisable = [ "stackprotector" "format" ]; inherit patches; diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix index f62d898cff74..63140dba37f7 100644 --- a/pkgs/development/libraries/isl/0.11.1.nix +++ b/pkgs/development/libraries/isl/0.11.1.nix @@ -13,9 +13,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # FIXME needs gcc 4.9 in bootstrap tools - hardeningDisable = [ "stackprotector" ]; - meta = { homepage = http://www.kotnet.org/~skimo/isl/; license = stdenv.lib.licenses.lgpl21; diff --git a/pkgs/development/libraries/isl/0.14.1.nix b/pkgs/development/libraries/isl/0.14.1.nix index 8196dec283ac..77ba20cbb200 100644 --- a/pkgs/development/libraries/isl/0.14.1.nix +++ b/pkgs/development/libraries/isl/0.14.1.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # FIXME needs gcc 4.9 in bootstrap tools + hardeningDisable = [ "stackprotector" ]; + meta = { homepage = http://www.kotnet.org/~skimo/isl/; license = stdenv.lib.licenses.lgpl21; |