mirror of
https://github.com/NaC-L/Mergen.git
synced 2026-05-12 09:40:34 +00:00
Force pinned LLVM clang in rewrite CI
This commit is contained in:
@@ -71,7 +71,9 @@ jobs:
|
||||
$llvmRoot = Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $llvmDir))
|
||||
$llvmBin = Join-Path $llvmRoot "bin"
|
||||
"LLVM_DIR=$llvmDir" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
|
||||
if (Test-Path (Join-Path $llvmBin "clang-cl.exe")) {
|
||||
$clangCl = Join-Path $llvmBin "clang-cl.exe"
|
||||
if (Test-Path $clangCl) {
|
||||
"CLANG_CL_EXE=$clangCl" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
|
||||
$llvmBin | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
|
||||
}
|
||||
Write-Host "Resolved LLVM_DIR=$llvmDir"
|
||||
|
||||
@@ -49,13 +49,15 @@ for %%I in ("%~dp0..\..") do set "REPO_ROOT=%%~fI"
|
||||
set "LLVM_CLANG_CL="
|
||||
for %%I in ("%LLVM_CMAKE_DIR%\..\..\..\bin\clang-cl.exe") do if exist "%%~fI" set "LLVM_CLANG_CL=%%~fI"
|
||||
|
||||
set "MERGEN_C_COMPILER=%CMAKE_C_COMPILER%"
|
||||
if not defined MERGEN_C_COMPILER if defined CLANG_CL_EXE set "MERGEN_C_COMPILER=%CLANG_CL_EXE%"
|
||||
set "MERGEN_C_COMPILER="
|
||||
if defined CLANG_CL_EXE set "MERGEN_C_COMPILER=%CLANG_CL_EXE%"
|
||||
if not defined MERGEN_C_COMPILER if defined LLVM_CLANG_CL set "MERGEN_C_COMPILER=%LLVM_CLANG_CL%"
|
||||
if not defined MERGEN_C_COMPILER if defined CMAKE_C_COMPILER set "MERGEN_C_COMPILER=%CMAKE_C_COMPILER%"
|
||||
if not defined MERGEN_C_COMPILER set "MERGEN_C_COMPILER=clang-cl"
|
||||
set "MERGEN_CXX_COMPILER=%CMAKE_CXX_COMPILER%"
|
||||
if not defined MERGEN_CXX_COMPILER if defined CLANG_CL_EXE set "MERGEN_CXX_COMPILER=%CLANG_CL_EXE%"
|
||||
set "MERGEN_CXX_COMPILER="
|
||||
if defined CLANG_CL_EXE set "MERGEN_CXX_COMPILER=%CLANG_CL_EXE%"
|
||||
if not defined MERGEN_CXX_COMPILER if defined LLVM_CLANG_CL set "MERGEN_CXX_COMPILER=%LLVM_CLANG_CL%"
|
||||
if not defined MERGEN_CXX_COMPILER if defined CMAKE_CXX_COMPILER set "MERGEN_CXX_COMPILER=%CMAKE_CXX_COMPILER%"
|
||||
if not defined MERGEN_CXX_COMPILER set "MERGEN_CXX_COMPILER=%MERGEN_C_COMPILER%"
|
||||
|
||||
::configure
|
||||
|
||||
@@ -33,13 +33,15 @@ set "BUILD_DIR=%REPO_ROOT%\build_zydis"
|
||||
set "LLVM_CLANG_CL="
|
||||
for %%I in ("%LLVM_CMAKE_DIR%\..\..\..\bin\clang-cl.exe") do if exist "%%~fI" set "LLVM_CLANG_CL=%%~fI"
|
||||
|
||||
set "MERGEN_C_COMPILER=%CMAKE_C_COMPILER%"
|
||||
if not defined MERGEN_C_COMPILER if defined CLANG_CL_EXE set "MERGEN_C_COMPILER=%CLANG_CL_EXE%"
|
||||
set "MERGEN_C_COMPILER="
|
||||
if defined CLANG_CL_EXE set "MERGEN_C_COMPILER=%CLANG_CL_EXE%"
|
||||
if not defined MERGEN_C_COMPILER if defined LLVM_CLANG_CL set "MERGEN_C_COMPILER=%LLVM_CLANG_CL%"
|
||||
if not defined MERGEN_C_COMPILER if defined CMAKE_C_COMPILER set "MERGEN_C_COMPILER=%CMAKE_C_COMPILER%"
|
||||
if not defined MERGEN_C_COMPILER set "MERGEN_C_COMPILER=clang-cl"
|
||||
set "MERGEN_CXX_COMPILER=%CMAKE_CXX_COMPILER%"
|
||||
if not defined MERGEN_CXX_COMPILER if defined CLANG_CL_EXE set "MERGEN_CXX_COMPILER=%CLANG_CL_EXE%"
|
||||
set "MERGEN_CXX_COMPILER="
|
||||
if defined CLANG_CL_EXE set "MERGEN_CXX_COMPILER=%CLANG_CL_EXE%"
|
||||
if not defined MERGEN_CXX_COMPILER if defined LLVM_CLANG_CL set "MERGEN_CXX_COMPILER=%LLVM_CLANG_CL%"
|
||||
if not defined MERGEN_CXX_COMPILER if defined CMAKE_CXX_COMPILER set "MERGEN_CXX_COMPILER=%CMAKE_CXX_COMPILER%"
|
||||
if not defined MERGEN_CXX_COMPILER set "MERGEN_CXX_COMPILER=%MERGEN_C_COMPILER%"
|
||||
|
||||
:configure
|
||||
|
||||
Reference in New Issue
Block a user