From 3394bed96e37913585e46529541b1019eee25be0 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 2 Jun 2021 06:32:19 +0200 Subject: Use objdump for dll dependencies (#18027) --- scripts/buildsystems/msbuild/applocal.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'scripts') 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($_)) { -- cgit v1.2.3