From 0364f6a6f587ae151736b2ef244498fdf7c5d804 Mon Sep 17 00:00:00 2001 From: "Stefan J. Wernli" Date: Wed, 29 Sep 2021 15:44:25 -0700 Subject: [PATCH 1/3] Force use of Chocolatey installed clang-11 --- src/Qir/Runtime/prerequisites.ps1 | 5 +++-- src/Qir/qir-utils.ps1 | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Qir/Runtime/prerequisites.ps1 b/src/Qir/Runtime/prerequisites.ps1 index 74b9607269d..45e27a2683e 100644 --- a/src/Qir/Runtime/prerequisites.ps1 +++ b/src/Qir/Runtime/prerequisites.ps1 @@ -6,9 +6,10 @@ if ($Env:ENABLE_QIRRUNTIME -ne "false") { if (($IsWindows) -or ((Test-Path Env:/AGENT_OS) -and ($Env:AGENT_OS.StartsWith("Win")))) { if (!(Get-Command clang -ErrorAction SilentlyContinue) -or ` - !(Get-Command clang-format -ErrorAction SilentlyContinue)) { + !(Get-Command clang-format -ErrorAction SilentlyContinue) -or ` + (Test-Path Env:/AGENT_OS)) { choco install llvm --version=11.1.0 - Write-Host "##vso[task.setvariable variable=PATH;]$Env:Path;C:\Program Files\LLVM\bin" + Write-Host "##vso[task.setvariable variable=PATH;]C:\Program Files\LLVM\bin;$Env:Path" } if (!(Get-Command ninja -ErrorAction SilentlyContinue)) { choco install ninja diff --git a/src/Qir/qir-utils.ps1 b/src/Qir/qir-utils.ps1 index 2d507d87e3e..5238131404f 100644 --- a/src/Qir/qir-utils.ps1 +++ b/src/Qir/qir-utils.ps1 @@ -192,9 +192,10 @@ function Build-CMakeProject { $env:CXX = "clang++.exe" $env:RC = "clang++.exe" - if (!(Get-Command clang -ErrorAction SilentlyContinue) -and (choco find --idonly -l llvm) -contains "llvm") { + if ((!(Get-Command clang -ErrorAction SilentlyContinue) -and (choco find --idonly -l llvm) -contains "llvm") -or ` + (Test-Path Env:AGENT_OS)) { # LLVM was installed by Chocolatey, so add the install location to the path. - $env:PATH += ";$($env:SystemDrive)\Program Files\LLVM\bin" + $env:PATH = "$($env:SystemDrive)\Program Files\LLVM\bin;$env:Path" } if (Get-Command clang-tidy -ErrorAction SilentlyContinue) { From 4f28fb0d0273fe65a726115e288b683b5268cfad Mon Sep 17 00:00:00 2001 From: "Stefan J. Wernli" Date: Wed, 29 Sep 2021 16:04:42 -0700 Subject: [PATCH 2/3] Use --allow-downgrade for older version --- src/Qir/Runtime/prerequisites.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Qir/Runtime/prerequisites.ps1 b/src/Qir/Runtime/prerequisites.ps1 index 45e27a2683e..f24baba80e5 100644 --- a/src/Qir/Runtime/prerequisites.ps1 +++ b/src/Qir/Runtime/prerequisites.ps1 @@ -8,7 +8,7 @@ if ($Env:ENABLE_QIRRUNTIME -ne "false") { if (!(Get-Command clang -ErrorAction SilentlyContinue) -or ` !(Get-Command clang-format -ErrorAction SilentlyContinue) -or ` (Test-Path Env:/AGENT_OS)) { - choco install llvm --version=11.1.0 + choco install llvm --version=11.1.0 --allow-downgrade Write-Host "##vso[task.setvariable variable=PATH;]C:\Program Files\LLVM\bin;$Env:Path" } if (!(Get-Command ninja -ErrorAction SilentlyContinue)) { From aa312c82968e81efd71348268c6ef5d0fd52f0f3 Mon Sep 17 00:00:00 2001 From: "Stefan J. Wernli" Date: Wed, 29 Sep 2021 17:15:46 -0700 Subject: [PATCH 3/3] Updates for PR comments --- src/Qir/Runtime/prerequisites.ps1 | 2 +- src/Qir/qir-utils.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Qir/Runtime/prerequisites.ps1 b/src/Qir/Runtime/prerequisites.ps1 index f24baba80e5..0452c936612 100644 --- a/src/Qir/Runtime/prerequisites.ps1 +++ b/src/Qir/Runtime/prerequisites.ps1 @@ -9,7 +9,7 @@ if ($Env:ENABLE_QIRRUNTIME -ne "false") { !(Get-Command clang-format -ErrorAction SilentlyContinue) -or ` (Test-Path Env:/AGENT_OS)) { choco install llvm --version=11.1.0 --allow-downgrade - Write-Host "##vso[task.setvariable variable=PATH;]C:\Program Files\LLVM\bin;$Env:Path" + Write-Host "##vso[task.setvariable variable=PATH;]$($env:SystemDrive)\Program Files\LLVM\bin;$Env:PATH" } if (!(Get-Command ninja -ErrorAction SilentlyContinue)) { choco install ninja diff --git a/src/Qir/qir-utils.ps1 b/src/Qir/qir-utils.ps1 index 5238131404f..11aac34ecfa 100644 --- a/src/Qir/qir-utils.ps1 +++ b/src/Qir/qir-utils.ps1 @@ -193,7 +193,7 @@ function Build-CMakeProject { $env:RC = "clang++.exe" if ((!(Get-Command clang -ErrorAction SilentlyContinue) -and (choco find --idonly -l llvm) -contains "llvm") -or ` - (Test-Path Env:AGENT_OS)) { + (Test-Path Env:/AGENT_OS)) { # LLVM was installed by Chocolatey, so add the install location to the path. $env:PATH = "$($env:SystemDrive)\Program Files\LLVM\bin;$env:Path" }