| commit | d407d2f32914979d36f8850a73b83d9aaff79d1c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Mar 02 19:03:46 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 02 19:03:46 2021 +0000 |
| tree | 7ab69295e58e8562725f29b85505fb9989309251 | |
| parent | 2f12f61aafb0fe69a9bf41cbd931c210388d12af [diff] | |
| parent | 2d24fe21bae8c23239fb156a8831f928985d44f3 [diff] |
Merge "Ignore LD_LIBRARY_PATH when determining file type in ldd." am: 2d24fe21ba Original change: https://android-review.googlesource.com/c/platform/bionic/+/1613125 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I869f3a92d2200960339361c80f4cb8c381fb738b
diff --git a/linker/ldd.sh b/linker/ldd.sh index 6bc49b4..56810bb 100755 --- a/linker/ldd.sh +++ b/linker/ldd.sh
@@ -10,7 +10,7 @@ [ $# -eq 1 ] || error "usage: ldd FILE" -what=$(file -L "$1") +what=$(LD_LIBRARY_PATH= file -L "$1") case "$what" in *32-bit*) linker --list "$1"