From: Giuseppe Ottaviano <ott@fb.com>
Date: Thu, 4 Feb 2016 01:32:42 +0000 (-0800)
Subject: Build workaround for nvcc in Malloc.h
X-Git-Tag: deprecate-dynamic-initializer~100
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=504f7fc5e3b9a60065113dc1725655ed5e9e872e;p=folly.git

Build workaround for nvcc in Malloc.h

Summary: See comment.

Reviewed By: juancarabina, luciang

Differential Revision: D2896262

fb-gh-sync-id: cb884651d47b86c0a5b3c2c22f421b2b1f39dc35
---

diff --git a/folly/Malloc.h b/folly/Malloc.h
index 828c1b65..8e99e379 100644
--- a/folly/Malloc.h
+++ b/folly/Malloc.h
@@ -116,7 +116,8 @@ namespace folly {
 #endif
 
 // Cannot depend on Portability.h when _LIBSTDCXX_FBSTRING.
-#ifdef __GNUC__
+// Disabled for nvcc because it fails on attributes on lambdas.
+#if defined(__GNUC__) && !defined(__NVCC__)
 #define FOLLY_MALLOC_NOINLINE __attribute__((__noinline__))
 #else
 #define FOLLY_MALLOC_NOINLINE