commit 5efd7f8ec9e03ce4923ed1d26702f2ebc992e863
author commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Mar 06 21:27:30 2014 +0000
committer commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Mar 06 21:27:30 2014 +0000
tree dcd9e16ecaa879fd308c136d584cfecada144d78
parent 11ce5ffee4b88848415f02847131717829259dff

Unreviewed, rolling out r165193.
http://trac.webkit.org/changeset/165193
https://bugs.webkit.org/show_bug.cgi?id=129823

Not specifying libc++ as the stdlib for Clang through CXXFLAGS
env confuses libtool (Requested by zdobersek on #webkit).

* Source/autotools/SetupCompilerFlags.m4:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@165209 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 2f73ba0..b0677bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2014-03-06  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r165193.
+        http://trac.webkit.org/changeset/165193
+        https://bugs.webkit.org/show_bug.cgi?id=129823
+
+        Not specifying libc++ as the stdlib for Clang through CXXFLAGS
+        env confuses libtool (Requested by zdobersek on #webkit).
+
+        * Source/autotools/SetupCompilerFlags.m4:
+
 2014-03-06  Zan Dobersek  <zdobersek@igalia.com>
 
         [GTK][Autotools] Default to libc++ when compiling with Clang

Source/autotools/SetupCompilerFlags.m4

diff --git a/Source/autotools/SetupCompilerFlags.m4 b/Source/autotools/SetupCompilerFlags.m4
index 0d9158b..dc13479 100644
--- a/Source/autotools/SetupCompilerFlags.m4
+++ b/Source/autotools/SetupCompilerFlags.m4
@@ -12,9 +12,10 @@
 if test "$cxx_compiler" = "clang++"; then
     CXXFLAGS="$CXXFLAGS -Qunused-arguments"
 
-    # Default to libc++ as the standard library to be used with Clang, if it isn't already enforced
-    # through CXXFLAGS (in case where some would still like to build using Clang and libstdc++).
-    AS_CASE([$CXXFLAGS], [*-stdlib=*], [], [CXXFLAGS="$CXXFLAGS -stdlib=libc++"])
+    # Default to libc++ as the standard library on Darwin, if it isn't already enforced through CXXFLAGS.
+    if test "$os_darwin" = "yes"; then
+        AS_CASE([$CXXFLAGS], [*-stdlib=*], [], [CXXFLAGS="$CXXFLAGS -stdlib=libc++"])
+    fi
 
     # If Clang will be using libstdc++ as the standard library, version >= 4.8.1 should be in use.
     AC_LANG_PUSH([C++])