Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-coredistools.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ if not exist "%BinariesDirectory%" (
pushd "%BinariesDirectory%"

cmake.exe ^
-G "Visual Studio 16 2019" ^
-G "Visual Studio 17 2022" ^
-A %GeneratorPlatform% ^
-DCMAKE_INSTALL_PREFIX="%StagingDirectory%" ^
-DLLVM_DEFAULT_TARGET_TRIPLE=%LLVMDefaultTargetTriple% ^
Expand Down
2 changes: 1 addition & 1 deletion build-tblgen.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ if not exist "%BinariesDirectory%" (
pushd "%BinariesDirectory%"

cmake.exe ^
-G "Visual Studio 16 2019" ^
-G "Visual Studio 17 2022" ^
-DCMAKE_INSTALL_PREFIX="%RootDirectory%\" ^
-DLLVM_TARGETS_TO_BUILD=AArch64;ARM;X86 ^
"%SourcesDirectory%\llvm-project\llvm"
Expand Down
14 changes: 7 additions & 7 deletions coredistools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ trigger:

resources:
containers:
- container: ubuntu-16.04-arm
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-20210719121212-8a8d3be
- container: ubuntu-16.04-arm64
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-20210719121212-8a8d3be
- container: ubuntu-18.04-arm
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-20220312201346-b9de666
- container: ubuntu-18.04-arm64
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-20220312201346-b2c2436

variables:
LLVMRepositoryUri: https://github.com/llvm/llvm-project.git
LLVMSourceBundle: llvm-project.bundle
LLVMSourceVersion: llvmorg-13.0.0
LLVMSourceVersion: llvmorg-13.0.1

jobs:
- job: checkout_llvm
Expand Down Expand Up @@ -73,12 +73,12 @@ jobs:
strategy:
matrix:
arm:
ContainerImage: ubuntu-16.04-arm
ContainerImage: ubuntu-18.04-arm
CrossRootfsDirectory: /crossrootfs/arm
TargetOSArchitecture: linux-arm

arm64:
ContainerImage: ubuntu-16.04-arm64
ContainerImage: ubuntu-18.04-arm64
CrossRootfsDirectory: /crossrootfs/arm64
TargetOSArchitecture: linux-arm64

Expand Down
6 changes: 3 additions & 3 deletions eng/download-llvm-release.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
from urllib.error import URLError, HTTPError

Release_urls = {
'llvmorg-13.0.0': {
'linux': 'https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/clang+llvm-13.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz',
'macos': 'https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/clang+llvm-13.0.0-x86_64-apple-darwin.tar.xz'
'llvmorg-13.0.1': {
'linux': 'https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.1/clang+llvm-13.0.1-x86_64-linux-gnu-ubuntu-18.04.tar.xz',
'macos': 'https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.1/clang+llvm-13.0.1-x86_64-apple-darwin.tar.xz'
}
}

Expand Down