diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-31 12:30:54 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-31 12:30:54 +0200 |
| commit | 60f07e8e109456c083c95fbf6618b38628e17956 (patch) | |
| tree | 1de9764658da37943bdabe15b9c7ab038f379996 /pkgs/development/compilers/gcc/5 | |
| parent | 5982591afc07480808d9c71a5b97463fc4cc9943 (diff) | |
| download | nixlib-60f07e8e109456c083c95fbf6618b38628e17956.tar nixlib-60f07e8e109456c083c95fbf6618b38628e17956.tar.gz nixlib-60f07e8e109456c083c95fbf6618b38628e17956.tar.bz2 nixlib-60f07e8e109456c083c95fbf6618b38628e17956.tar.lz nixlib-60f07e8e109456c083c95fbf6618b38628e17956.tar.xz nixlib-60f07e8e109456c083c95fbf6618b38628e17956.tar.zst nixlib-60f07e8e109456c083c95fbf6618b38628e17956.zip | |
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.
Diffstat (limited to 'pkgs/development/compilers/gcc/5')
| -rw-r--r-- | pkgs/development/compilers/gcc/5/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/5/use-old-abi.sh | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 53e64fe8abc6..3b105143c0bf 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 3a0c996033a9..000000000000 --- a/pkgs/development/compilers/gcc/5/use-old-abi.sh +++ /dev/null @@ -1 +0,0 @@ -NIX_CFLAGS_COMPILE+=" -D_GLIBCXX_USE_CXX11_ABI=0" |