Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-04-07 21:52:26 +00:00
parent a73a28de7b 25cc1c12fe
commit 3e68106afd
198 changed files with 32102 additions and 27617 deletions
@@ -498,8 +498,6 @@ stdenv.mkDerivation ({

  inherit (stdenv) is64bit;

-  setupHook = ./use-old-abi.sh;
-
  meta = {
    homepage = http://gcc.gnu.org/;
    license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
@@ -1 +0,0 @@
-NIX_CFLAGS_COMPILE+=" -D_GLIBCXX_USE_CXX11_ABI=0"
				`@@ -1 +0,0 @@`
				`NIX_CFLAGS_COMPILE+=" -D_GLIBCXX_USE_CXX11_ABI=0"`