Title: [165209] trunk
Revision
165209
Author
[email protected]
Date
2014-03-06 13:27:30 -0800 (Thu, 06 Mar 2014)

Log Message

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:

Modified Paths

Diff

Modified: trunk/ChangeLog (165208 => 165209)


--- trunk/ChangeLog	2014-03-06 21:27:13 UTC (rev 165208)
+++ trunk/ChangeLog	2014-03-06 21:27:30 UTC (rev 165209)
@@ -1,3 +1,14 @@
+2014-03-06  Commit Queue  <[email protected]>
+
+        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  <[email protected]>
 
         [GTK][Autotools] Default to libc++ when compiling with Clang

Modified: trunk/Source/autotools/SetupCompilerFlags.m4 (165208 => 165209)


--- trunk/Source/autotools/SetupCompilerFlags.m4	2014-03-06 21:27:13 UTC (rev 165208)
+++ trunk/Source/autotools/SetupCompilerFlags.m4	2014-03-06 21:27:30 UTC (rev 165209)
@@ -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++])
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to