From d18c4051756d3def6ef35a6678bf4b84d548c162 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Fri, 4 Dec 2020 13:45:53 +0300 Subject: [PATCH] [macOS] Clarify clang versions (#2147) * add clang versions * changed default location to get-command * changed formatting Co-authored-by: Leonid Lapshin --- images/macos/software-report/SoftwareReport.Common.psm1 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 449135ca3..2145290ae 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -72,8 +72,12 @@ function Get-FortranVersion { } function Get-ClangLLVMVersion { - $clangLLVMVersion = Run-Command "$(brew --prefix llvm)/bin/clang --version" | Select-Object -First 1 | Take-Part -Part 2 - "Clang/LLVM $clangLLVMVersion" + $locationsList = @("$((Get-Command clang).Source)", '$(brew --prefix llvm)/bin/clang') + $locationsList | Foreach-Object { + (Run-Command "${_} --version" | Out-String) -match "(?\d+\.\d+\.\d+)" | Out-Null + $version = $Matches.version + "Clang/LLVM $version " + $(if(${_} -Match "brew") {"is available on ``${_}``"} else {"is default"}) + } } function Get-NVMVersion {