From d15e3c7e70df20693560528274ca54726fea9871 Mon Sep 17 00:00:00 2001
From: Jens Georg <jens.georg@desy.de>
Date: Wed, 27 May 2020 18:19:53 +0200
Subject: [PATCH] More clang-8
---
vars/buildDoocsTargetConfig.groovy | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/vars/buildDoocsTargetConfig.groovy b/vars/buildDoocsTargetConfig.groovy
index 20c6fad..fc5bf35 100644
--- a/vars/buildDoocsTargetConfig.groovy
+++ b/vars/buildDoocsTargetConfig.groovy
@@ -62,10 +62,10 @@ def transformIntoStep(String buildName) {
cd \${DOOCSARCH}
sed -i CONFIG -e 's|^EPICS[[:space:]]*=.*\$|EPICS = '/export/epics'|'
if [ "${buildType}" == "tsan" ]; then
- sed -i CONFIG -e 's/%.o:/# OVERRIDES\\n\\nCC = clang-6.0\\nCXX = clang++-6.0\\nCFLAGS += -fsanitize=thread\\nCXXFLAGS += -fsanitize=thread\\nLDFLAGS += -fsanitize=thread\\n\\n%.o:/'
+ sed -i CONFIG -e 's/%.o:/# OVERRIDES\\n\\nCC = clang-8\\nCXX = clang++-8\\nCFLAGS += -fsanitize=thread\\nCXXFLAGS += -fsanitize=thread\\nLDFLAGS += -fsanitize=thread\\n\\n%.o:/'
#sed -i CONFIG -e 's/%.o:/# OVERRIDES\\n\\nCFLAGS += -fsanitize=thread\\nCXXFLAGS += -fsanitize=thread\\nLDFLAGS += -fsanitize=thread\\n\\n%.o:/'
elif [ "${buildType}" == "asan" ]; then
- sed -i CONFIG -e 's/%.o:/# OVERRIDES\\n\\nCC = clang-6.0\\nCXX = clang++-6.0\\nCFLAGS += -fsanitize=address -fsanitize=undefined -fsanitize=leak\\nCXXFLAGS += -fsanitize=address -fsanitize=undefined -fsanitize=leak\\nLDFLAGS += -fsanitize=address -fsanitize=undefined -fsanitize=leak\\n\\n%.o:/'
+ sed -i CONFIG -e 's/%.o:/# OVERRIDES\\n\\nCC = clang-8\\nCXX = clang++-8\\nCFLAGS += -fsanitize=address -fsanitize=undefined -fsanitize=leak\\nCXXFLAGS += -fsanitize=address -fsanitize=undefined -fsanitize=leak\\nLDFLAGS += -fsanitize=address -fsanitize=undefined -fsanitize=leak\\n\\n%.o:/'
#sed -i CONFIG -e 's/%.o:/# OVERRIDES\\n\\nCFLAGS += -fsanitize=address -fsanitize=undefined -fsanitize=leak\\nCXXFLAGS += -fsanitize=address -fsanitize=undefined -fsanitize=leak\\nLDFLAGS += -fsanitize=address -fsanitize=undefined -fsanitize=leak\\n\\n%.o:/'
fi
mkdir -p /scratch
--
GitLab