Skip to content

Commit

Permalink
sdk-installer: work around objdump problem
Browse files Browse the repository at this point in the history
Apparently 32-bit objdump does not like the way we extract .pdb files
from git.exe and git-remote-https.exe: it always fails with "File
truncated". The 64-bit objdump seems to be unaffected by this bug.

Let's switch to using ldd instead, hopefully this will work around the
issue: we only need to release a new SDK every blue moon, anyway.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information
dscho committed Apr 11, 2018
1 parent 0976d8e commit 1227299
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sdk-installer/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ do
todo=${todo#* }
exes_and_dlls="$exes_and_dlls$file "

for dll in $(objdump -p "$BIN_DIR/$file" |
sed -n "s|^\tDLL Name: ||p")
for dll in $(ldd "$BIN_DIR/$file" |
sed -n "s|.*> $BIN_DIR/\\([^ ]*\\).*|\\1|p")
do
case " $exes_and_dlls $todo " in
*" $dll "*) ;; # already found/queued
Expand Down

0 comments on commit 1227299

Please sign in to comment.