Merge pull request #264 from alexcrichton/dep-of-std

Prepare for publication to crates.io
This commit is contained in:
Alex Crichton 2018-11-21 13:07:20 -06:00 committed by GitHub
commit 66d44b0b49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 13 deletions

View File

@ -6,6 +6,11 @@ version = "0.1.0"
[lib] [lib]
test = false test = false
[dependencies]
# For more information on this dependency see rust-lang/rust's
# `src/tools/rustc-std-workspace` folder
core = { version = "1.0.0", optional = true, package = 'rustc-std-workspace-core' }
[build-dependencies] [build-dependencies]
cc = { optional = true, version = "1.0" } cc = { optional = true, version = "1.0" }
@ -32,9 +37,18 @@ mangled-names = []
# Don't generate lang items for i128 intrisnics and such # Don't generate lang items for i128 intrisnics and such
no-lang-items = [] no-lang-items = []
# Only used in the compiler's build system
rustc-dep-of-std = ['c', 'compiler-builtins', 'core']
[[example]] [[example]]
name = "intrinsics" name = "intrinsics"
required-features = ["c", "compiler-builtins"] required-features = ["c", "compiler-builtins"]
[workspace] [workspace]
members = ["testcrate"] members = ["testcrate"]
[profile.release]
panic = 'abort'
[profile.dev]
panic = 'abort'

View File

@ -64,18 +64,7 @@ case $1 in
;; ;;
esac esac
case "$TRAVIS_OS_NAME" in NM=nm
osx)
# NOTE OSx's nm doesn't accept the `--defined-only` or provide an equivalent.
# Use GNU nm instead
NM=gnm
brew update
brew install binutils
;;
*)
NM=nm
;;
esac
if [ -d /target ]; then if [ -d /target ]; then
path=/target/${1}/debug/deps/libcompiler_builtins-*.rlib path=/target/${1}/debug/deps/libcompiler_builtins-*.rlib

View File

@ -11,7 +11,6 @@
#![feature(lang_items)] #![feature(lang_items)]
#![feature(start)] #![feature(start)]
#![feature(allocator_api)] #![feature(allocator_api)]
#![cfg_attr(windows, feature(panic_unwind))]
#![no_std] #![no_std]
extern crate panic_handler; extern crate panic_handler;