Revert "Merge pull request #86954 from lovesegfault/binutils-2.34"

Pythons find_library is broken with binutils 2.34, and numpy could not import libraries because of not properly aligned ELF's.

This is the second time binutils 2.34 got reverted. Next time, we should have a dedicated Hydra job for it.

This reverts commit 629fa8a2d4, reversing
changes made to 4ddd080d19.
This commit is contained in:
Frederik Rietdijk
2020-05-23 10:18:26 +02:00
parent 73390e3349
commit 24c96b9259
7 changed files with 1345 additions and 21 deletions
+1 -1
View File
@@ -203,7 +203,7 @@ stdenv.mkDerivation ({
configureScript="`pwd`/../$sourceRoot/configure"
${lib.optionalString (stdenv.cc.libc != null)
''makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib OBJDUMP=${stdenv.cc.bintools.bintools}/bin/objdump"''
''makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib"''
}