aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xconfigure4
-rw-r--r--configure.ac4
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index fdd7c76..e22f63e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-28 Jan-Benedict Glaw <jbglaw@lug-owl.de>
+
+ * configure.ac (noconfigdirs): Merge from GCC.
+ * configure: Regenerate.
+
2012-11-19 Jan-Benedict Glaw <jbglaw@lug-owl.de>
* config.sub (arm): Merge from upstream: Handle armv[6-8] targets.
diff --git a/configure b/configure
index d72d4f9..16bbaa8 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 24ea7e5..cd6721e 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