Disable libsanitizer for non-C++ builds.

	* configure.ac (noconfigdirs): Merge from GCC.
	* configure: Regenerate.

diff --git a/ChangeLog b/ChangeLog
index fdd7c76dbf36553932e2fe297c5317b0e3b90dc0..e22f63ea1eceb0e422638e6e1de37cf5e2b2c3cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-28  Jan-Benedict Glaw  <[email protected]>
+
+       * configure.ac (noconfigdirs): Merge from GCC.
+       * configure: Regenerate.
+
 2012-11-19  Jan-Benedict Glaw  <[email protected]>
 
        * config.sub (arm): Merge from upstream: Handle armv[6-8] targets.

diff --git a/configure b/configure
index d72d4f93f9c5002df0c6796ef41b5ffcb94c7c5d..16bbaa82bedf3950e9c2fdc1f8d6aac3f2ad7a3e 100755 (executable)
--- 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 24ea7e526a3ff6b16d7d483ce84a24b848368586..cd6721e45945e492a9f4dd0e78f593012c19122d 100644 (file)
--- 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