Changeset 161359 in webkit

Timestamp:

Jan 6, 2014 12:03:05 PM (10 years ago)

Author:

zandobersek@gmail.com

Message:

[GTK] configure errors out when building with libc++
​https://bugs.webkit.org/show_bug.cgi?id=126431

Reviewed by Martin Robinson.

Ease up the Clang and libstdc++ combination test to only fail if libstdc++ < 4.8.1 is actually used.
This allows for libc++ to be used as well. The test is moved into SetupCompilerFlags.m4 and is done
after the CXXFLAGS variable is properly set up, that is when all the C++ compiler options are determined.

• Source/autotools/CheckSystemAndBasicDependencies.m4:
• Source/autotools/SetupCompilerFlags.m4:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/autotools/CheckSystemAndBasicDependencies.m4 (modified) (1 diff)
• Source/autotools/SetupCompilerFlags.m4 (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2014-01-06  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK] configure errors out when building with libc++
+        https://bugs.webkit.org/show_bug.cgi?id=126431
+
+        Reviewed by Martin Robinson.
+
+        Ease up the Clang and libstdc++ combination test to only fail if libstdc++ < 4.8.1 is actually used.
+        This allows for libc++ to be used as well. The test is moved into SetupCompilerFlags.m4 and is done
+        after the CXXFLAGS variable is properly set up, that is when all the C++ compiler options are determined.
+
+        * Source/autotools/CheckSystemAndBasicDependencies.m4:
+        * Source/autotools/SetupCompilerFlags.m4:
+
 2014-01-06  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/autotools/CheckSystemAndBasicDependencies.m4

@@ -120 +120 @@
 if test "$cxx_compiler" = "unknown"; then
     AC_MSG_ERROR([Compiler GCC >= 4.7 or Clang >= 3.2 is required for C++ compilation])
-elif test "$cxx_compiler" = "clang++"; then
-    OLD_CXXFLAGS="$CXXFLAGS"
-    CXXFLAGS="-std=c++11"
-    AC_LANG_PUSH([C++])
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
-#include <type_traits>
-#if defined(__GLIBCXX__) && __GLIBCXX__ >= 20130531
-bool libstdcxxTest = std::is_trivially_destructible<bool>::value;
-#else
-#error libstdc++ >= 4.8.1 is required
-#endif
-])], [], [AC_MSG_ERROR([libstdc++ >= 4.8.1 is required as the standard library used with the Clang compiler.])])
-    AC_LANG_POP([C++])
-    CXXFLAGS="$OLD_CXXFLAGS"
 fi
 

trunk/Source/autotools/SetupCompilerFlags.m4

@@ -17 +17 @@
         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++])
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+#if defined(__GLIBCXX__) && __GLIBCXX__ >= 20130531
+#include <type_traits>
+bool libstdcxxTest = std::is_trivially_destructible<bool>::value;
+#endif
+])], [], [AC_MSG_ERROR([libstdc++ >= 4.8.1 is required as the standard library used with the Clang compiler.])])
+    AC_LANG_POP([C++])
 fi