aboutsummaryrefslogtreecommitdiff
path: root/contrib/libcxxrt
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2016-03-27 00:37:54 +0000
committerDimitry Andric <dim@FreeBSD.org>2016-03-27 00:37:54 +0000
commit35b9ea3d0912237f240483c38ad33c2e25cd0e50 (patch)
tree014aef060723b2c8e1f5a5f8a4ec00a059586fe2 /contrib/libcxxrt
parentfddd4f62738232e820abb4f3a81dcd6dcad83932 (diff)
downloadsrc-35b9ea3d0912237f240483c38ad33c2e25cd0e50.tar.gz
src-35b9ea3d0912237f240483c38ad33c2e25cd0e50.zip
Compile libcxxrt as C++11, since it is only really used in combination
with libc++, which is also C++11. Also change one _Static_assert (which is really C11) back into static_assert, like upstream. This should help when compiling libcxxrt with newer versions of gcc, which refuse to recognize any form of static assertions, if not compiling for C++11 or higher. While here, add -nostdinc++ to CFLAGS, to prevent picking up any C++ headers outside the source tree.
Notes
Notes: svn path=/head/; revision=297299
Diffstat (limited to 'contrib/libcxxrt')
-rw-r--r--contrib/libcxxrt/guard.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/libcxxrt/guard.cc b/contrib/libcxxrt/guard.cc
index f1c4c69fa6b9..34d294cf7432 100644
--- a/contrib/libcxxrt/guard.cc
+++ b/contrib/libcxxrt/guard.cc
@@ -101,7 +101,7 @@ typedef struct {
uint32_t init_half;
uint32_t lock_half;
} guard_t;
-_Static_assert(sizeof(guard_t) == sizeof(uint64_t), "");
+static_assert(sizeof(guard_t) == sizeof(uint64_t), "");
static const uint32_t LOCKED = 1;
static const uint32_t INITIALISED = static_cast<guard_lock_t>(1) << 24;
# endif