diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 4 |
3 files changed, 9 insertions, 4 deletions
@@ -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. @@ -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 24ea7e526..cd6721e45 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 |