From 32e1925bd4fe209e06e145dfa127e1b2030d0911 Mon Sep 17 00:00:00 2001 From: dpalermo Date: Wed, 15 Jul 2026 14:41:26 -0500 Subject: [PATCH 1/2] [srock] SROCK_THEROCK_BRANCH change default to main (#2342) --- srock-bin/srock_common_vars | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srock-bin/srock_common_vars b/srock-bin/srock_common_vars index c5b97072f..b17f4048b 100644 --- a/srock-bin/srock_common_vars +++ b/srock-bin/srock_common_vars @@ -84,7 +84,8 @@ SROCK_MAJOR_VERSION=${SROCK_VERSION%.*} # Set SROCK_COMPILER_BRANCH to develop to get a native TheRock build SROCK_COMPILER_BRANCH=${SROCK_COMPILER_BRANCH:-amd-staging} -SROCK_THEROCK_BRANCH=${SROCK_THEROCK_BRANCH:-compiler/amd-staging} +#SROCK_THEROCK_BRANCH=${SROCK_THEROCK_BRANCH:-compiler/amd-staging} +SROCK_THEROCK_BRANCH=${SROCK_THEROCK_BRANCH:-main} SROCK_CONFIG=${SROCK_CONFIG:-minimal} # Set default value for ROCm install directory SROCK_INSTALL_DIR. From 54059c2c5e0c440865ebfdc2bf75d27935f60cc7 Mon Sep 17 00:00:00 2001 From: dpalermo Date: Wed, 15 Jul 2026 14:42:59 -0500 Subject: [PATCH 2/2] [srock] Update _TheRock_00_compiler-srock.patch (#2341) --- .../patches/amd-staging/_TheRock_00_compiler-srock.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srock-bin/patches/amd-staging/_TheRock_00_compiler-srock.patch b/srock-bin/patches/amd-staging/_TheRock_00_compiler-srock.patch index d2c849e15..c19c95e65 100644 --- a/srock-bin/patches/amd-staging/_TheRock_00_compiler-srock.patch +++ b/srock-bin/patches/amd-staging/_TheRock_00_compiler-srock.patch @@ -1,10 +1,10 @@ diff --git a/compiler/CMakeLists.txt b/compiler/CMakeLists.txt -index bf625919..cdc6c493 100644 +index 7279cdbb3..103eb2332 100644 --- a/compiler/CMakeLists.txt +++ b/compiler/CMakeLists.txt -@@ -13,6 +13,10 @@ if(THEROCK_ENABLE_COMPILER) - if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - list(APPEND _extra_llvm_cmake_args "-DLLVM_ENABLE_PEDANTIC=OFF") +@@ -22,6 +22,10 @@ if(THEROCK_ENABLE_COMPILER) + if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + list(APPEND _extra_llvm_cmake_args "-DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON") endif() + if (DEFINED ENV{SROCK_VERSION_MOD}) + list(APPEND _extra_llvm_cmake_args "-DLLVM_VERSION_SUFFIX=_SROCK")