Skip to content

Commit 2b01a37

Browse files
committedFeb 21, 2015
Auto merge of #21959 - dhuseby:bitrig-support, r=brson
This patch adds the necessary pieces to support rust on Bitrig https://bitrig.org
2 parents 522d09d + 5513040 commit 2b01a37

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+773
-150
lines changed
 

‎configure

+12-1
Original file line numberDiff line numberDiff line change
@@ -374,8 +374,12 @@ case $CFG_OSTYPE in
374374
CFG_OSTYPE=unknown-dragonfly
375375
;;
376376

377+
Bitrig)
378+
CFG_OSTYPE=unknown-bitrig
379+
;;
380+
377381
OpenBSD)
378-
CFG_OSTYPE=unknown-openbsd
382+
CFG_OSTYPE=unknown-openbsd
379383
;;
380384

381385
Darwin)
@@ -747,6 +751,13 @@ then
747751
CFG_ENABLE_CLANG=1
748752
fi
749753

754+
# Force bitrig to build with clang; gcc doesn't like us there
755+
if [ $CFG_OSTYPE = unknown-bitrig ]
756+
then
757+
step_msg "on Bitrig, forcing use of clang"
758+
CFG_ENABLE_CLANG=1
759+
fi
760+
750761
if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ]
751762
then
752763
err "either clang or gcc is required"

‎mk/cfg/x86_64-unknown-bitrig.mk

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# x86_64-unknown-bitrig-elf configuration
2+
CC_x86_64-unknown-bitrig=$(CC)
3+
CXX_x86_64-unknown-bitrig=$(CXX)
4+
CPP_x86_64-unknown-bitrig=$(CPP)
5+
AR_x86_64-unknown-bitrig=$(AR)
6+
CFG_LIB_NAME_x86_64-unknown-bitrig=lib$(1).so
7+
CFG_STATIC_LIB_NAME_x86_64-unknown-bitrig=lib$(1).a
8+
CFG_LIB_GLOB_x86_64-unknown-bitrig=lib$(1)-*.so
9+
CFG_LIB_DSYM_GLOB_x86_64-unknown-bitrig=$(1)-*.dylib.dSYM
10+
CFG_JEMALLOC_CFLAGS_x86_64-unknown-bitrig := -m64 -I/usr/include $(CFLAGS)
11+
CFG_GCCISH_CFLAGS_x86_64-unknown-bitrig := -Wall -Werror -fPIC -m64 -I/usr/include $(CFLAGS)
12+
CFG_GCCISH_LINK_FLAGS_x86_64-unknown-bitrig := -shared -pic -pthread -m64 $(LDFLAGS)
13+
CFG_GCCISH_DEF_FLAG_x86_64-unknown-bitrig := -Wl,--export-dynamic,--dynamic-list=
14+
CFG_GCCISH_PRE_LIB_FLAGS_x86_64-unknown-bitrig := -Wl,-pic -Wl,-whole-archive
15+
CFG_GCCISH_POST_LIB_FLAGS_x86_64-unknown-bitrig := -Wl,-no-whole-archive
16+
CFG_DEF_SUFFIX_x86_64-unknown-bitrig := .bsd.def
17+
CFG_LLC_FLAGS_x86_64-unknown-bitrig :=
18+
CFG_INSTALL_NAME_x86_64-unknown-bitrig =
19+
CFG_EXE_SUFFIX_x86_64-unknown-bitrig :=
20+
CFG_WINDOWSY_x86_64-unknown-bitrig :=
21+
CFG_UNIXY_x86_64-unknown-bitrig := 1
22+
CFG_PATH_MUNGE_x86_64-unknown-bitrig :=
23+
CFG_LDPATH_x86_64-unknown-bitrig :=
24+
CFG_RUN_x86_64-unknown-bitrig=$(2)
25+
CFG_RUN_TARG_x86_64-unknown-bitrig=$(call CFG_RUN_x86_64-unknown-bitrig,,$(2))
26+
CFG_GNU_TRIPLE_x86_64-unknown-bitrig := x86_64-unknown-bitrig

0 commit comments

Comments
 (0)
Please sign in to comment.