Skip to content

Commit

Permalink
Update clang and its llvm (#1086)
Browse files Browse the repository at this point in the history
* Update clang and its llvm

This may be needed to build cleanly with GCC 13

* Tell clspv's CMakeLists.txt file where to find libclc

* Update to clang-13.0.1
  • Loading branch information
dneto0 authored Jan 31, 2025
1 parent 6fa5ac1 commit 3fb20a0
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ vars = {
'swiftshader_git': 'https://swiftshader.googlesource.com',
'martinus_git': 'https://github.com/martinus',

'clspv_llvm_revision': 'b70366c9c430e1eadd59d5a1dfbb9c4d84f83de5',
'clspv_revision': 'f99809bdab1710846633b4ec24f5448263e75da7',
'clspv_llvm_revision': '4a2ebd6661cf1c929c280e863e4299164800413e',
'clspv_revision': '05fe1edbafb8d98ce798e7d9feb4a219bea114ef',
'cpplint_revision': 'fa12a0bbdafa15291276ddd2a2dcd2ac7a2ce4cb',
'dxc_revision': '773b01272719e07ea369bc17f5ddfce248751c7a',
'directx_headers_revision': '980971e835876dc0cde415e8f9bc646e64667bf7',
Expand Down
2 changes: 1 addition & 1 deletion kokoro/linux-clang-debug/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ set -e # fail on error
set -x # display commands

SCRIPT_DIR=`dirname "$BASH_SOURCE"`
source $SCRIPT_DIR/../scripts/linux/build.sh DEBUG "clang-10.0.0" \
source $SCRIPT_DIR/../scripts/linux/build.sh DEBUG "clang-13.0.1" \
-DAMBER_ENABLE_SWIFTSHADER=TRUE
2 changes: 1 addition & 1 deletion kokoro/linux-clang-release/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ set -e # fail on error
set -x # display commands

SCRIPT_DIR=`dirname "$BASH_SOURCE"`
source $SCRIPT_DIR/../scripts/linux/build.sh RELEASE "clang-10.0.0" \
source $SCRIPT_DIR/../scripts/linux/build.sh RELEASE "clang-13.0.1" \
-DAMBER_ENABLE_SWIFTSHADER=TRUE \
-DAMBER_USE_DXC=TRUE
1 change: 1 addition & 0 deletions third_party/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ if (${AMBER_ENABLE_CLSPV})

set(CLSPV_LLVM_SOURCE_DIR "${AMBER_CLSPV_LLVM_DIR}/llvm" CACHE STRING "")
set(CLSPV_CLANG_SOURCE_DIR "${AMBER_CLSPV_LLVM_DIR}/clang" CACHE STRING "")
set(CLSPV_LIBCLC_SOURCE_DIR "${AMBER_CLSPV_LLVM_DIR}/libclc" CACHE STRING "")
set(SPIRV_HEADERS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/spirv-headers" CACHE STRING "")
set(SPIRV_TOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools" CACHE STRING "")
set(LINKER_SUPPORTS_COLOR_DIAGNOSTICS 0 CACHE INTERNAL 0 FORCE)
Expand Down

0 comments on commit 3fb20a0

Please sign in to comment.