Merge pull request #8820 from cms-sw/asan-root630

Changes needed for ASAN/UBSAN ROOTX IBs
cms-sw · Nov 15, 2023 · e47ac1f · e47ac1f
2 parents bba9c4f + 12d9a44
commit e47ac1f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/SCRAMV1.spec b/SCRAMV1.spec
@@ -1,8 +1,8 @@
-### RPM lcg SCRAMV1 V3_00_64
+### RPM lcg SCRAMV1 V3_00_65
 ## NOCOMPILER
 ## NO_VERSION_SUFFIX
 
-%define tag 49a36349e8482b5953e79b49352b80eb234c50e6
+%define tag 1b7ab7fa877c99da1a6afc7476d4feff68be9648
 %define branch SCRAMV3
 %define github_user cms-sw
 Source: git+https://github.com/%{github_user}/SCRAM.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz

diff --git a/cmssw-queue-override.file b/cmssw-queue-override.file
@@ -30,9 +30,8 @@
 %define release_usercxxflags    -fexceptions -fstack-protector-all --param=ssp-buffer-size=4 -Wp,-D_FORTIFY_SOURCE=2
 %endif
 
-%if "%(case %realversion in (*_UBSAN_X*) echo true ;; (*) echo false ;; esac)" == "true"
+%if "%(case %realversion in (*UBSAN*) echo true ;; (*) echo false ;; esac)" == "true"
 %define release_usercxxflags    -g
-%define patchsrc20   sed -i -e 's|</tool>|  <runtime name="UBSAN_OPTIONS" value="print_stacktrace=1"/>\\n</tool>|' config/Self.xml
 %endif
 
 %if "%(case %realversion in (*_ICC_X*) echo true ;; (*) echo false ;; esac)" == "true"

diff --git a/scram-project-build.file b/scram-project-build.file
@@ -55,7 +55,7 @@ BuildRequires: dwz
 %endif
 
 %if "%{?configtag:set}" != "set"
-%define configtag       V09-01-04
+%define configtag       V09-01-05
 %endif
 
 %if "%{?buildarch:set}" != "set"

diff --git a/scram-tools.file/tools/gcc/gcc-cxxcompiler.xml b/scram-tools.file/tools/gcc/gcc-cxxcompiler.xml
@@ -35,13 +35,13 @@
     <runtime name="@OS_RUNTIME_LDPATH_NAME@" value="$GCC_CXXCOMPILER_BASE/lib" type="path"/>
     <runtime name="SCRAM_CXX11_ABI" value="@SCRAM_CXX11_ABI@"/>
     <runtime name="PATH" value="$GCC_CXXCOMPILER_BASE/bin" type="path"/>
-    <ifrelease name="_ASAN">
+    <ifrelease name="ASAN">
       <runtime name="GCC_RUNTIME_ASAN" value="$GCC_CXXCOMPILER_BASE/@OS_LIB64DIR@/libasan.so" type="path"/>
-    <elif name="_LSAN"/>
+    <elif name="LSAN"/>
       <runtime name="GCC_RUNTIME_LSAN" value="$GCC_CXXCOMPILER_BASE/@OS_LIB64DIR@/libasan.so" type="path"/>
-    <elif name="_UBSAN"/>
+    <elif name="UBSAN"/>
       <runtime name="GCC_RUNTIME_UBSAN" value="$GCC_CXXCOMPILER_BASE/@OS_LIB64DIR@/libubsan.so" type="path"/>
-    <elif name="_TSAN"/>
+    <elif name="TSAN"/>
       <runtime name="GCC_RUNTIME_TSAN" value="$GCC_CXXCOMPILER_BASE/@OS_LIB64DIR@/libtsan.so" type="path"/>
     </ifrelease>
     <runtime name="COMPILER_PATH" value="@TOOL_ROOT@"/>