Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(112)

Unified Diff: cmake/config-ix-pnacl.cmake

Issue 904473004: Rebased localmods in libcxx to 223109. (Closed)
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « PRESUBMIT.py ('k') | codereview.settings » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cmake/config-ix-pnacl.cmake
diff --git a/cmake/config-ix-pnacl.cmake b/cmake/config-ix-pnacl.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..829cfcc1e6dcd026cacc33f2c1f1e18eda182230
--- /dev/null
+++ b/cmake/config-ix-pnacl.cmake
@@ -0,0 +1,46 @@
+# @LOCALMOD-START The PNaCl driver automatically adds dependencies to
+# libc++ which hasn't been built yet. The tests for
+# flags therefore fail because the library can't be
+# found. We should fix this in a different CL, and add
+# proper detection for newlib's lack of locale_t
+# support. See:
+# https://code.google.com/p/nativeclient/issues/detail?id=3661
+
+set(LIBCXX_HAS_STDCXX0X_FLAG 1)
+set(LIBCXX_HAS_STDCXX11_FLAG 1)
+set(LIBCXX_HAS_FPIC_FLAG 0) # Not quite true, but untested in PNaCl.
+set(LIBCXX_HAS_NODEFAULTLIBS_FLAG 1)
+set(LIBCXX_HAS_NOSTDINCXX_FLAG 1)
+set(LIBCXX_HAS_WALL_FLAG 1)
+set(LIBCXX_HAS_W_FLAG 1)
+set(LIBCXX_HAS_WNO_UNUSED_PARAMETER_FLAG 1)
+set(LIBCXX_HAS_WWRITE_STRINGS_FLAG 1)
+set(LIBCXX_HAS_WNO_LONG_LONG_FLAG 1)
+set(LIBCXX_HAS_PEDANTIC_FLAG 1)
+set(LIBCXX_HAS_WERROR_FLAG 1)
+set(LIBCXX_HAS_WNO_ERROR_FLAG 1)
+set(LIBCXX_HAS_FNO_EXCEPTIONS_FLAG 1)
+set(LIBCXX_HAS_FNO_RTTI_FLAG 1)
+# MSVC flags:
+set(LIBCXX_HAS_WX_FLAG 0)
+set(LIBCXX_HAS_NO_WX_FLAG 0)
+set(LIBCXX_HAS_EHSC_FLAG 0)
+set(LIBCXX_HAS_NO_EHS_FLAG 0)
+set(LIBCXX_HAS_NO_EHA_FLAG 0)
+set(LIBCXX_HAS_NO_GR_FLAG 0)
+
+set(LIBCXX_HAS_PTHREAD_LIB 1)
+set(LIBCXX_HAS_C_LIB 1)
+set(LIBCXX_HAS_M_LIB 1)
+set(LIBCXX_HAS_RT_LIB 0)
+set(LIBCXX_HAS_GCC_S_LIB 0)
+# @LOCALMOD-END
+
+# Check C++0x features
+if (LIBCXX_ENABLE_CXX0X)
+ if (LIBCXX_HAS_STDCXX0X_FLAG)
+ set(CMAKE_REQUIRED_DEFINITIONS -std=c++0x)
+ endif()
+else()
+ set(LIBCXX_HAS_STDCXX0X_FLAG FALSE)
+endif()
« no previous file with comments | « PRESUBMIT.py ('k') | codereview.settings » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698