Merge pull request #8285 from cms-sw/smuzaffar-patch-16

[BuildRules] Reorder Rocm flags so that those can override compilers flags
cms-sw · Feb 3, 2023 · 28f629a · 28f629a
2 parents 3048c59 + 99cc383
commit 28f629a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/scram-project-build.file b/scram-project-build.file
@@ -54,7 +54,7 @@ BuildRequires: dwz
 %endif
 
 %if "%{?configtag:set}" != "set"
-%define configtag       V07-05-04
+%define configtag       V07-05-06
 %endif
 
 %if "%{?cvssrc:set}" != "set"

diff --git a/scram-tools.file/tools/cuda/cuda.xml b/scram-tools.file/tools/cuda/cuda.xml
@@ -12,8 +12,8 @@
     <environment name="INCLUDE"   default="$CUDA_BASE/include"/>
   </client>
   <flags CUDA_FLAGS="@CUDA_FLAGS@"/>
-  <flags CUDA_HOST_REM_CXXFLAGS="-std=%"/>
-  <flags CUDA_HOST_REM_CXXFLAGS="%potentially-evaluated-expression"/>
+  <flags REM_CUDA_HOST_CXXFLAGS="-std=%"/>
+  <flags REM_CUDA_HOST_CXXFLAGS="%potentially-evaluated-expression"/>
   <flags CUDA_HOST_CXXFLAGS="@CUDA_HOST_CXXFLAGS@"/>
   <lib name="cudadevrt" type="cuda"/>
   <runtime name="ROOT_INCLUDE_PATH"  value="$INCLUDE" type="path"/>