-
-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
4 changed files
with
93 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
echo on | ||
|
||
cmake %CMAKE_ARGS% ^ | ||
-G "Ninja" ^ | ||
-DLLVM_DIR=%LIBRARY_PREFIX%\cmake\llvm ^ | ||
-DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ | ||
-DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^ | ||
-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=%LIBRARY_PREFIX% ^ | ||
-S . -B ./build | ||
if %ERRORLEVEL% neq 0 exit 1 | ||
|
||
cmake --build ./build | ||
if %ERRORLEVEL% neq 0 exit 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
echo on | ||
|
||
cmake --install ./build --prefix %LIBRARY_PREFIX% | ||
if %ERRORLEVEL% neq 0 exit 1 | ||
|
||
move %LIBRARY_BIN%\llvm-spirv.exe %LIBRARY_BIN%\llvm-spirv-%MAJOR_VERSION%.exe | ||
if %ERRORLEVEL% neq 0 exit 1 | ||
|
||
mklink /h %LIBRARY_BIN%\llvm-spirv.exe %LIBRARY_BIN%\llvm-spirv-%MAJOR_VERSION%.exe | ||
if %ERRORLEVEL% neq 0 exit 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
recipe/patches/0001-Work-around-a-bug-in-the-llvm-config.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
From 4e96cd52c7f5c695ecf3da195947874e202df870 Mon Sep 17 00:00:00 2001 | ||
From: Yevhenii Havrylko <[email protected]> | ||
Date: Tue, 4 Jun 2024 23:58:29 -0400 | ||
Subject: [PATCH] Work around a bug in the llvm config | ||
|
||
--- | ||
CMakeLists.txt | 3 +++ | ||
1 file changed, 3 insertions(+) | ||
|
||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 3cb4386..0c0c9ae 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -72,6 +72,9 @@ if(LLVM_SPIRV_BUILD_EXTERNAL) | ||
set(CMAKE_CXX_STANDARD 17) | ||
set(CMAKE_CXX_STANDARD_REQUIRED ON) | ||
|
||
+ # https://github.com/llvm/llvm-project/issues/83802 | ||
+ include(GNUInstallDirs) | ||
+ | ||
if(LLVM_SPIRV_INCLUDE_TESTS) | ||
set(LLVM_TEST_COMPONENTS | ||
llvm-as | ||
-- | ||
2.40.0.windows.1 | ||
|