From bdb4f575492938215213d749b81610c7735d9063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Tue, 6 Aug 2024 16:01:54 +0200 Subject: [PATCH] Add configure for libraries in /usr/local for the gcc:tsan job The TSAN-enabled libraries are installed to /usr/local, pass the PKG_CONFIG_PATH and few other options to CFLAGS to the configure arguments. (cherry picked from commit ed766efc15da8b1ca3c597b5b53ab7e2bd331e85) --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2a8f05c29..78d4fa8d88 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1053,9 +1053,9 @@ unit:clang:asan: gcc:tsan: variables: CC: gcc - CFLAGS: "${CFLAGS_COMMON} -fsanitize=thread -DISC_MEM_USE_INTERNAL_MALLOC=0" + CFLAGS: "${CFLAGS_COMMON} -Wno-stringop-overread -ggdb -O2 -fsanitize=thread -DISC_MEM_USE_INTERNAL_MALLOC=0 -Wl,-rpath=/usr/local/lib -Wl,--enable-new-dtags" LDFLAGS: "-fsanitize=thread" - EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock" + EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock PKG_CONFIG_PATH=/usr/local/lib/pkgconfig" <<: *tsan_fedora_40_amd64_image <<: *build_job