aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Henderson <rth@redhat.com>2012-01-04 17:35:25 -0800
committerRichard Henderson <rth@gcc.gnu.org>2012-01-04 17:35:25 -0800
commit99776ebd5b998562662bc8fd054d20865751a8fa (patch)
treeed66bfe3f00e27ed5b2a77a416a23ffa7ea37ba2
parentcbd651333df334be66eb2160e22cfeb84377fba7 (diff)
downloadgcc-99776ebd5b998562662bc8fd054d20865751a8fa.zip
gcc-99776ebd5b998562662bc8fd054d20865751a8fa.tar.gz
gcc-99776ebd5b998562662bc8fd054d20865751a8fa.tar.bz2
re PR libitm/51072 (Build with --disable-bootstrap fails in libitm)
PR bootstrap/51072 * configure.ac: Disable libitm if c++ is not enabled. * configure: Rebuild. From-SVN: r182899
-rw-r--r--ChangeLog6
-rwxr-xr-xconfigure8
-rw-r--r--configure.ac8
3 files changed, 22 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b9d08f3..a8019b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-05 Richard Henderson <rth@redhat.com>
+
+ PR bootstrap/51072
+ * configure.ac: Disable libitm if c++ is not enabled.
+ * configure: Rebuild.
+
2012-01-02 Balaji V. Iyer <bviyer@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.