diff options
| author | bors <bors@rust-lang.org> | 2015-02-21 09:20:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-02-21 09:20:48 +0000 |
| commit | 2b01a37ec38db9301239f0c0abcf3c695055b0ff (patch) | |
| tree | a8fbf2329325d51716f163780d5e932989d04e06 /src/libstd/rt | |
| parent | 522d09dfecbeca1595f25ac58c6d0178bbd21d7d (diff) | |
| parent | 551304015bac6f8424fcc6827855d3c61fe167c9 (diff) | |
| download | rust-2b01a37ec38db9301239f0c0abcf3c695055b0ff.tar.gz rust-2b01a37ec38db9301239f0c0abcf3c695055b0ff.zip | |
Auto merge of #21959 - dhuseby:bitrig-support, r=brson
This patch adds the necessary pieces to support rust on Bitrig https://bitrig.org
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/args.rs | 1 | ||||
| -rw-r--r-- | src/libstd/rt/libunwind.rs | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/libstd/rt/args.rs b/src/libstd/rt/args.rs index 61f5bd0f013..9da63405346 100644 --- a/src/libstd/rt/args.rs +++ b/src/libstd/rt/args.rs @@ -43,6 +43,7 @@ pub fn clone() -> Option<Vec<Vec<u8>>> { imp::clone() } target_os = "android", target_os = "freebsd", target_os = "dragonfly", + target_os = "bitrig", target_os = "openbsd"))] mod imp { use prelude::v1::*; diff --git a/src/libstd/rt/libunwind.rs b/src/libstd/rt/libunwind.rs index 43e3a43f56d..3063d9d942a 100644 --- a/src/libstd/rt/libunwind.rs +++ b/src/libstd/rt/libunwind.rs @@ -109,6 +109,10 @@ extern {} #[link(name = "gcc_pic")] extern {} +#[cfg(target_os = "bitrig")] +#[link(name = "c++abi")] +extern {} + extern "C" { // iOS on armv7 uses SjLj exceptions and requires to link // against corresponding routine (..._SjLj_...) |