summary refs log tree commit diff
path: root/pkgs/development/compilers/gcc/5
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2016-08-12 09:46:53 +0000
committerRobin Gloster <mail@glob.in>2016-08-12 09:46:53 +0000
commitb7787d932ec9cbd82ea6bc7c69d8df159b606fdc (patch)
treec4b6af2e6b49732ce5c6982cb8512ce9b7f1f34d /pkgs/development/compilers/gcc/5
parentbc025e83bd6c44df38851ef23da53359a0e62841 (diff)
parent532b2222965377e77ed884c463ee2751fb51dba3 (diff)
downloadnixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar
nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.gz
nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.bz2
nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.lz
nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.xz
nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.zst
nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.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.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 89a452166a13..74f7f37e7f30 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -189,6 +189,9 @@ let version = "5.4.0";
             # To keep ABI compatibility with upstream mingw-w64
             " --enable-fully-dynamic-string"
             else (if cross.libc == "uclibc" then
+              # libsanitizer requires netrom/netrom.h which is not
+              # available in uclibc.
+              " --disable-libsanitizer" +
               # In uclibc cases, libgomp needs an additional '-ldl'
               # and as I don't know how to pass it, I disable libgomp.
               " --disable-libgomp" else "") +