From 60f07e8e109456c083c95fbf6618b38628e17956 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 31 Mar 2016 12:30:54 +0200
Subject: [PATCH] Revert "gcc: Use the pre-C++11 ABI by default"

This reverts commit 83011723af5cf666db4cd10c14f9162b0a463fa1. This
never worked because gcc's setup hook is never actually sourced. I
could fix this but since nobody complained, we probably don't need it.
---
 pkgs/development/compilers/gcc/5/default.nix    | 2 --
 pkgs/development/compilers/gcc/5/use-old-abi.sh | 1 -
 2 files changed, 3 deletions(-)
 delete mode 100644 pkgs/development/compilers/gcc/5/use-old-abi.sh

diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 53e64fe8abc..3b105143c0b 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -495,8 +495,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+
diff --git a/pkgs/development/compilers/gcc/5/use-old-abi.sh b/pkgs/development/compilers/gcc/5/use-old-abi.sh
deleted file mode 100644
index 3a0c996033a..00000000000
--- a/pkgs/development/compilers/gcc/5/use-old-abi.sh
+++ /dev/null
@@ -1 +0,0 @@
-NIX_CFLAGS_COMPILE+=" -D_GLIBCXX_USE_CXX11_ABI=0"