diff options
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | mk/platform.mk | 2 | ||||
| -rw-r--r-- | src/rt/rust_unwind.h | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/configure b/configure index 5d94b854ea2..1601f46ac1e 100755 --- a/configure +++ b/configure @@ -340,7 +340,8 @@ then CFG_CLANG_VERSION=$("$CFG_CLANG" \ --version \ | grep version \ - | cut -d ' ' -f 3) + | sed 's/.*\(version .*\)/\1/' \ + | cut -d ' ' -f 2) case $CFG_CLANG_VERSION in (3.0svn | 3.0 | 3.1) diff --git a/mk/platform.mk b/mk/platform.mk index 0018a3bd8e5..d33da016e2a 100644 --- a/mk/platform.mk +++ b/mk/platform.mk @@ -188,7 +188,7 @@ ifeq ($(CFG_C_COMPILER),clang) CC=clang CXX=clang++ CPP=cpp - CFG_GCCISH_CFLAGS += -Wall -Werror -fno-rtti -g + CFG_GCCISH_CFLAGS += -Wall -Werror -Wno-c++11-compat -fno-rtti -g CFG_GCCISH_LINK_FLAGS += -g CFG_DEPEND_C = $(CFG_GCCISH_CROSS)$(CXX) $(CFG_GCCISH_CFLAGS) -MT "$(1)" \ -MM $(2) diff --git a/src/rt/rust_unwind.h b/src/rt/rust_unwind.h index 2a7e559d189..61acf89b6c0 100644 --- a/src/rt/rust_unwind.h +++ b/src/rt/rust_unwind.h @@ -17,6 +17,8 @@ typedef int _Unwind_Reason_Code; #if (defined __APPLE__) || (defined __clang__) +#ifndef __FreeBSD__ + typedef int _Unwind_Action; typedef void _Unwind_Exception; @@ -24,3 +26,5 @@ typedef void _Unwind_Exception; #endif +#endif + |