Skip to content

Commit 271abd2

Browse files
committed
fix(ci): harmonize LLVM toolchain for ARM64 link and bump version to 6.40.1.1
1 parent ab5c573 commit 271abd2

3 files changed

Lines changed: 11 additions & 12 deletions

File tree

‎.github/workflows/build-release.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ jobs:
2929
submodules: recursive
3030
fetch-depth: 0
3131

32-
- name: Install Toolchain
33-
run: choco install llvm -y
32+
# Note: Visual Studio on GitHub Actions runner already includes matched LLVM/Clang-cl/lld-link
3433

3534
- name: Setup Ninja
3635
uses: seanmiddleditch/gha-setup-ninja@master

‎QuickView/QuickView.rc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
// Version Information - This sets the display name in Windows
1414
VS_VERSION_INFO VERSIONINFO
15-
FILEVERSION 6,40,1,0
16-
PRODUCTVERSION 6,40,1,0
15+
FILEVERSION 6,40,1,1
16+
PRODUCTVERSION 6,40,1,1
1717
FILEFLAGSMASK 0x3fL
1818
FILEFLAGS 0x0L
1919
FILEOS 0x40004L
@@ -26,12 +26,12 @@ BEGIN
2626
BEGIN
2727
VALUE "CompanyName", "QuickView"
2828
VALUE "FileDescription", "QuickView"
29-
VALUE "FileVersion", "6.40.1.0"
29+
VALUE "FileVersion", "6.40.1.1"
3030
VALUE "InternalName", "QuickView.exe"
3131
VALUE "LegalCopyright", "Copyright (C) 2026"
3232
VALUE "OriginalFilename", "QuickView.exe"
3333
VALUE "ProductName", "QuickView"
34-
VALUE "ProductVersion", "6.40.1.0"
34+
VALUE "ProductVersion", "6.40.1.1"
3535
END
3636
END
3737
BLOCK "VarFileInfo"

‎cmake/lld-link-wrapper.bat‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,15 @@ echo [QuickViewLinker] LIB After = "!LIB!" >&2
7272
:: 3. Locate lld-link.exe dynamically
7373
set "LLVM_LINKER_EXE="
7474

75-
:: Priority 1: Standalone LLVM in standard locations
76-
if exist "C:\Program Files\LLVM\bin\lld-link.exe" set "LLVM_LINKER_EXE=C:\Program Files\LLVM\bin\lld-link.exe"
77-
if not defined LLVM_LINKER_EXE if exist "D:\Program Files\LLVM\bin\lld-link.exe" set "LLVM_LINKER_EXE=D:\Program Files\LLVM\bin\lld-link.exe"
78-
if not defined LLVM_LINKER_EXE if exist "C:\Program Files (x86)\LLVM\bin\lld-link.exe" set "LLVM_LINKER_EXE=C:\Program Files (x86)\LLVM\bin\lld-link.exe"
79-
80-
:: Priority 2: Visual Studio internal LLVM tools
75+
:: Priority 1: Visual Studio internal LLVM tools (guarantees bitcode version match with clang-cl)
8176
if not defined LLVM_LINKER_EXE if exist "!VS_PATH!\VC\Tools\Llvm\x64\bin\lld-link.exe" set "LLVM_LINKER_EXE=!VS_PATH!\VC\Tools\Llvm\x64\bin\lld-link.exe"
8277
if not defined LLVM_LINKER_EXE if exist "!VS_PATH!\VC\Tools\Llvm\bin\lld-link.exe" set "LLVM_LINKER_EXE=!VS_PATH!\VC\Tools\Llvm\bin\lld-link.exe"
8378

79+
:: Priority 2: Standalone LLVM in standard locations
80+
if not defined LLVM_LINKER_EXE if exist "C:\Program Files\LLVM\bin\lld-link.exe" set "LLVM_LINKER_EXE=C:\Program Files\LLVM\bin\lld-link.exe"
81+
if not defined LLVM_LINKER_EXE if exist "D:\Program Files\LLVM\bin\lld-link.exe" set "LLVM_LINKER_EXE=D:\Program Files\LLVM\bin\lld-link.exe"
82+
if not defined LLVM_LINKER_EXE if exist "C:\Program Files (x86)\LLVM\bin\lld-link.exe" set "LLVM_LINKER_EXE=C:\Program Files (x86)\LLVM\bin\lld-link.exe"
83+
8484
:: Priority 3: System PATH
8585
if not defined LLVM_LINKER_EXE (
8686
for /f "tokens=*" %%i in ('where lld-link.exe 2^>nul') do (

0 commit comments

Comments
 (0)