diff options
| author | Kai Pastor <dg0yt@darc.de> | 2021-06-02 06:32:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-01 21:32:19 -0700 |
| commit | 3394bed96e37913585e46529541b1019eee25be0 (patch) | |
| tree | 6baf57f3bd66df2945b712e81d45ac2b638b2c30 /scripts | |
| parent | 835f1613b5d785eed9cfc6c0b76d6ac2aa0a61ba (diff) | |
| download | vcpkg-3394bed96e37913585e46529541b1019eee25be0.tar.gz vcpkg-3394bed96e37913585e46529541b1019eee25be0.zip | |
Use objdump for dll dependencies (#18027)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/msbuild/applocal.ps1 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/buildsystems/msbuild/applocal.ps1 b/scripts/buildsystems/msbuild/applocal.ps1 index 2e8d76cc2..abd102ab0 100644 --- a/scripts/buildsystems/msbuild/applocal.ps1 +++ b/scripts/buildsystems/msbuild/applocal.ps1 @@ -90,8 +90,10 @@ function resolve([string]$targetBinary) { $a = $(dumpbin /DEPENDENTS $targetBinary | ? { $_ -match "^ [^ ].*\.dll" } | % { $_ -replace "^ ","" }) } elseif (Get-Command "llvm-objdump" -ErrorAction SilentlyContinue) { $a = $(llvm-objdump -p $targetBinary| ? { $_ -match "^ {4}DLL Name: .*\.dll" } | % { $_ -replace "^ {4}DLL Name: ","" }) + } elseif (Get-Command "objdump" -ErrorAction SilentlyContinue) { + $a = $(objdump -p $targetBinary| ? { $_ -match "^\tDLL Name: .*\.dll" } | % { $_ -replace "^\tDLL Name: ","" }) } else { - Write-Error "Neither dumpbin nor llvm-objdump could be found. Can not take care of dll dependencies." + Write-Error "Neither dumpbin, llvm-objdump nor objdump could be found. Can not take care of dll dependencies." } $a | % { if ([string]::IsNullOrEmpty($_)) { |