55 lines
1.5 KiB
Diff
55 lines
1.5 KiB
Diff
From 0cdaa2229fd4855ee61f68cd7f7172f585fb4572 Mon Sep 17 00:00:00 2001
|
|
From: jchzhou <zhoujiacheng@iscas.ac.cn>
|
|
Date: Thu, 19 Sep 2024 18:16:30 +0800
|
|
Subject: [PATCH] configure: only append -fanalyzer when building with gcc
|
|
|
|
Anaconda fails to build with clang as the compiler doesn't recognize -fanalyzer
|
|
introduced experimentally in #3482 for supplementing cppcheck. Only append that
|
|
when building with gcc instead.
|
|
|
|
Signed-off-by: jchzhou <zhoujiacheng@iscas.ac.cn>
|
|
---
|
|
configure | 6 +++++-
|
|
configure.ac | 7 ++++++-
|
|
2 files changed, 11 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index 05e4a1d..53c8ec8 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -15536,8 +15536,12 @@ fi
|
|
SHUT_UP_GCC="-Wno-unused-result"
|
|
|
|
# Add remaining compiler flags we want to use
|
|
-CFLAGS="$CFLAGS -Wall -Werror $SHUT_UP_GCC -fanalyzer"
|
|
+# only append -fanalyzer when building with gcc
|
|
+CFLAGS="$CFLAGS -Wall -Werror $SHUT_UP_GCC"
|
|
|
|
+if [[ "$CC" == "gcc" ]]; then
|
|
+ CFLAGS="$CFLAGS -fanalyzer"
|
|
+fi
|
|
|
|
# Perform arch related tests
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 42cdae6..e515488 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -97,7 +97,12 @@ ANACONDA_PKG_CHECK_MODULES([LIBARCHIVE], [libarchive >= 3.0.4])
|
|
SHUT_UP_GCC="-Wno-unused-result"
|
|
|
|
# Add remaining compiler flags we want to use
|
|
-CFLAGS="$CFLAGS -Wall -Werror $SHUT_UP_GCC -fanalyzer"
|
|
+# only append -fanalyzer when building with gcc
|
|
+CFLAGS="$CFLAGS -Wall -Werror $SHUT_UP_GCC"
|
|
+
|
|
+if [[ "$CC" == "gcc" ]]; then
|
|
+ CFLAGS="$CFLAGS -fanalyzer"
|
|
+fi
|
|
|
|
|
|
# Perform arch related tests
|
|
--
|
|
2.46.1
|
|
|