You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2014/02/07 02:55:37 UTC

[2/2] git commit: Fixed configure.ac to require libc++ only on Mac OS X.

Fixed configure.ac to require libc++ only on Mac OS X.

This patch fixes configure failure on Linux clang builds.

Review: https://reviews.apache.org/r/16909


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/bbc348fe
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/bbc348fe
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/bbc348fe

Branch: refs/heads/master
Commit: bbc348fe86fd40a126cbced7b730e6be450425cb
Parents: 0d52d6d
Author: Vinson Lee <vl...@freedesktop.org>
Authored: Thu Feb 6 17:55:11 2014 -0800
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Thu Feb 6 17:55:11 2014 -0800

----------------------------------------------------------------------
 configure.ac | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/bbc348fe/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 18bf4bf..4f988a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -604,10 +604,14 @@ AM_CONDITIONAL([WITH_INCLUDED_ZOOKEEPER],
 if test "x$with_cxx11" = "xyes"; then
   AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])
 
-   # If we're using clang, we need to pass -stdlib=libc++ too.
-  if test "x$CLANG" = "xyes"; then
-    CXXFLAGS="$CXXFLAGS -stdlib=libc++"
-  fi
+  case "$host_os" in
+  darwin* )
+    # If we're using clang, we need to pass -stdlib=libc++ too.
+    if test "x$CLANG" = "xyes"; then
+      CXXFLAGS="$CXXFLAGS -stdlib=libc++"
+    fi
+    ;;
+  esac
 
   # Force gtest to use it's own tuple implementation since 'tr1/tuple'
   # might not exist (for example, if building with clang).