Skip to content

Commit

Permalink
Merge pull request #264 from alexcrichton/dep-of-std
Browse files Browse the repository at this point in the history
Prepare for publication to crates.io
  • Loading branch information
alexcrichton committed Nov 21, 2018
2 parents 4890819 + 02bcce8 commit 66d44b0
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 deletions.
14 changes: 14 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ version = "0.1.0"
[lib]
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]
cc = { optional = true, version = "1.0" }

Expand All @@ -32,9 +37,18 @@ mangled-names = []
# Don't generate lang items for i128 intrisnics and such
no-lang-items = []

# Only used in the compiler's build system
rustc-dep-of-std = ['c', 'compiler-builtins', 'core']

[[example]]
name = "intrinsics"
required-features = ["c", "compiler-builtins"]

[workspace]
members = ["testcrate"]

[profile.release]
panic = 'abort'

[profile.dev]
panic = 'abort'
13 changes: 1 addition & 12 deletions ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,7 @@ case $1 in
;;
esac

case "$TRAVIS_OS_NAME" in
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
NM=nm

if [ -d /target ]; then
path=/target/${1}/debug/deps/libcompiler_builtins-*.rlib
Expand Down
1 change: 0 additions & 1 deletion examples/intrinsics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#![feature(lang_items)]
#![feature(start)]
#![feature(allocator_api)]
#![cfg_attr(windows, feature(panic_unwind))]
#![no_std]

extern crate panic_handler;
Expand Down

0 comments on commit 66d44b0

Please sign in to comment.