Skip to content

Commit 24c96b9

Browse files
committed
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 629fa8a, reversing changes made to 4ddd080.
1 parent 73390e3 commit 24c96b9

7 files changed

Lines changed: 1345 additions & 21 deletions

pkgs/development/libraries/glibc/common.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ stdenv.mkDerivation ({
203203
configureScript="`pwd`/../$sourceRoot/configure"
204204
205205
${lib.optionalString (stdenv.cc.libc != null)
206-
''makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib OBJDUMP=${stdenv.cc.bintools.bintools}/bin/objdump"''
206+
''makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib"''
207207
}
208208
209209

0 commit comments

Comments
 (0)