diff options
| author | Robin Gloster <mail@glob.in> | 2016-04-07 21:52:26 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-04-07 21:52:26 +0000 |
| commit | 3e68106afd95df012ddb548575f0133681687a90 (patch) | |
| tree | e2919b6900e6de13a3f52756acc02058a1ef0421 /pkgs/development/compilers/gcc/5 | |
| parent | a73a28de7b16734d8e28da8be43a06b92eeb6bc3 (diff) | |
| parent | 25cc1c12febf74c66d661528e2fc2b00caff1bf1 (diff) | |
| download | nixlib-3e68106afd95df012ddb548575f0133681687a90.tar nixlib-3e68106afd95df012ddb548575f0133681687a90.tar.gz nixlib-3e68106afd95df012ddb548575f0133681687a90.tar.bz2 nixlib-3e68106afd95df012ddb548575f0133681687a90.tar.lz nixlib-3e68106afd95df012ddb548575f0133681687a90.tar.xz nixlib-3e68106afd95df012ddb548575f0133681687a90.tar.zst nixlib-3e68106afd95df012ddb548575f0133681687a90.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
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 f0a0b8e34643..1df60bb78406 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -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+ 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" |