about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorSimonas Kazlauskas <git@kazlauskas.me>2016-08-24 16:48:35 +0300
committerest31 <MTest31@outlook.com>2016-12-30 15:17:26 +0100
commitec1fdfe1c392c61dffebf0db0f348de566ae0804 (patch)
tree6d0c397bb7a077217ae3e1a562736f0ae26c108a /src
parent64fbce6826bd14594e645847fd11be290ca9fade (diff)
downloadrust-ec1fdfe1c392c61dffebf0db0f348de566ae0804.tar.gz
rust-ec1fdfe1c392c61dffebf0db0f348de566ae0804.zip
Makefiles support for rustc_i128 crate
This commit includes manual merge conflict resolution changes from a rebase by @est31.
Diffstat (limited to 'src')
-rw-r--r--src/librustc_i128/lib.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/librustc_i128/lib.rs b/src/librustc_i128/lib.rs
index c5b52148d1e..a9770396e78 100644
--- a/src/librustc_i128/lib.rs
+++ b/src/librustc_i128/lib.rs
@@ -9,6 +9,8 @@
 // except according to those terms.
 #![allow(non_camel_case_types)]
 #![cfg_attr(not(stage0), feature(i128_type))]
+#![crate_type="rlib"]
+#![crate_name="rustc_i128"]
 
 #[cfg(stage0)]
 pub type i128 = i64;