summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8c24d354549..35f33673a10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-04 Balaji V. Iyer <balaji.v.iyer@intel.com>
+
+ * configure.ac: Added libcilkrts to noconfig list when C++ is not
+ supported.
+ * configure: Regenerated.
+
2013-11-01 Trevor Saunders <tsaunders@mozilla.com>
* MAINTAINERS (Write After Approval): Add myself.
diff --git a/configure b/configure
index c95990a6f4c..d4a82137bad 100755
--- a/configure
+++ b/configure
@@ -6630,7 +6630,7 @@ esac
case ,${enable_languages}, in
*,c++,*) ;;
*)
- noconfigdirs="$noconfigdirs target-libitm target-libsanitizer target-libvtv"
+ noconfigdirs="$noconfigdirs target-libcilkrts target-libitm target-libsanitizer target-libvtv"
;;
esac
diff --git a/configure.ac b/configure.ac
index 140877ffedc..30190d65bea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2061,7 +2061,7 @@ esac
case ,${enable_languages}, in
*,c++,*) ;;
*)
- noconfigdirs="$noconfigdirs target-libitm target-libsanitizer target-libvtv"
+ noconfigdirs="$noconfigdirs target-libcilkrts target-libitm target-libsanitizer target-libvtv"
;;
esac
OpenPOWER on IntegriCloud