Skip to content

Commit c2bf9b7

Browse files
crabtwbrson
authored andcommitted
freebsd clang support
1 parent 2898dcc commit c2bf9b7

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

configure

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,8 @@ then
340340
CFG_CLANG_VERSION=$("$CFG_CLANG" \
341341
--version \
342342
| grep version \
343-
| cut -d ' ' -f 3)
343+
| sed 's/.*\(version .*\)/\1/' \
344+
| cut -d ' ' -f 2)
344345

345346
case $CFG_CLANG_VERSION in
346347
(3.0svn | 3.0 | 3.1)

mk/platform.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ ifeq ($(CFG_C_COMPILER),clang)
188188
CC=clang
189189
CXX=clang++
190190
CPP=cpp
191-
CFG_GCCISH_CFLAGS += -Wall -Werror -fno-rtti -g
191+
CFG_GCCISH_CFLAGS += -Wall -Werror -Wno-c++11-compat -fno-rtti -g
192192
CFG_GCCISH_LINK_FLAGS += -g
193193
CFG_DEPEND_C = $(CFG_GCCISH_CROSS)$(CXX) $(CFG_GCCISH_CFLAGS) -MT "$(1)" \
194194
-MM $(2)

src/rt/rust_unwind.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,14 @@ typedef int _Unwind_Reason_Code;
1717

1818
#if (defined __APPLE__) || (defined __clang__)
1919

20+
#ifndef __FreeBSD__
21+
2022
typedef int _Unwind_Action;
2123
typedef void _Unwind_Exception;
2224

2325
#endif
2426

2527
#endif
2628

29+
#endif
30+

0 commit comments

Comments
 (0)