From c23b5043ce222d89275b7fa1608f9bf7e0faa065 Mon Sep 17 00:00:00 2001 From: Jan-Benedict Glaw Date: Wed, 28 Nov 2012 11:43:47 +0000 Subject: [PATCH] Disable libsanitizer for non-C++ builds. * configure.ac (noconfigdirs): Merge from GCC. * configure: Regenerate. --- ChangeLog | 5 +++++ configure | 4 ++-- configure.ac | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index fdd7c76dbf3..e22f63ea1ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-11-28 Jan-Benedict Glaw + + * configure.ac (noconfigdirs): Merge from GCC. + * configure: Regenerate. + 2012-11-19 Jan-Benedict Glaw * config.sub (arm): Merge from upstream: Handle armv[6-8] targets. diff --git a/configure b/configure index d72d4f93f9c..16bbaa82bed 100755 --- a/configure +++ b/configure @@ -6437,11 +6437,11 @@ case ,${enable_languages},:${enable_objc_gc} in ;; esac -# Disable libitm if we're not building C++ +# Disable libitm and libsanitizer if we're not building C++ case ,${enable_languages}, in *,c++,*) ;; *) - noconfigdirs="$noconfigdirs target-libitm" + noconfigdirs="$noconfigdirs target-libitm target-libsanitizer" ;; esac diff --git a/configure.ac b/configure.ac index 24ea7e526a3..cd6721e4594 100644 --- a/configure.ac +++ b/configure.ac @@ -2008,11 +2008,11 @@ case ,${enable_languages},:${enable_objc_gc} in ;; esac -# Disable libitm if we're not building C++ +# Disable libitm and libsanitizer if we're not building C++ case ,${enable_languages}, in *,c++,*) ;; *) - noconfigdirs="$noconfigdirs target-libitm" + noconfigdirs="$noconfigdirs target-libitm target-libsanitizer" ;; esac -- 2.30.2