Second try. Unlike adjusting the gcc/cp fragment, I can't imagine this has any other side effects.
Tested on x86_64-linux. Committed. r~
diff --git a/ChangeLog b/ChangeLog index b9d08f3..a8019b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-01-05 Richard Henderson <r...@redhat.com> + + PR bootstrap/51072 + * configure.ac: Disable libitm if c++ is not enabled. + * configure: Rebuild. + 2012-01-02 Balaji V. Iyer <bvi...@gmail.com> * MAINTAINERS (Write After Approval): Add myself. diff --git a/configure b/configure index fd6defa..d970c1d 100755 --- a/configure +++ b/configure @@ -6473,6 +6473,14 @@ case ,${enable_languages},:${enable_objc_gc} in ;; esac +# Disable libitm if we're not building C++ +case ,${enable_languages}, in + *,c++) ;; + *) + noconfigdirs="$noconfigdirs target-libitm" + ;; +esac + # Remove the entries in $skipdirs and $noconfigdirs from $configdirs, # $build_configdirs and $target_configdirs. # If we have the source for $noconfigdirs entries, add them to $notsupp. diff --git a/configure.ac b/configure.ac index 9fee563..b97c505 100644 --- a/configure.ac +++ b/configure.ac @@ -1982,6 +1982,14 @@ case ,${enable_languages},:${enable_objc_gc} in ;; esac +# Disable libitm if we're not building C++ +case ,${enable_languages}, in + *,c++) ;; + *) + noconfigdirs="$noconfigdirs target-libitm" + ;; +esac + # Remove the entries in $skipdirs and $noconfigdirs from $configdirs, # $build_configdirs and $target_configdirs. # If we have the source for $noconfigdirs entries, add them to $notsupp.