diff options
| author | Marco Castelluccio <mcastelluccio@mozilla.com> | 2017-06-04 15:54:39 +0100 |
|---|---|---|
| committer | Marco Castelluccio <mcastelluccio@mozilla.com> | 2017-06-04 15:54:39 +0100 |
| commit | ecba8d6a23d8bafd6296d619180a5f3e09bb21b1 (patch) | |
| tree | 6f95b5427b14d9b0d0c8975aa450269c7943649e /src/libstd | |
| parent | 1b5a923001c481627d7b1d19d0fe1d3f86e5c5a6 (diff) | |
| parent | 42754ce710a777b38402b12728daf54d68ea2b50 (diff) | |
| download | rust-ecba8d6a23d8bafd6296d619180a5f3e09bb21b1.tar.gz rust-ecba8d6a23d8bafd6296d619180a5f3e09bb21b1.zip | |
Merge branch 'profiling' of github.com:whitequark/rust into profiling
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/Cargo.toml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index e17918506fe..b516cbd08ca 100644 --- a/src/libstd/Cargo.toml +++ b/src/libstd/Cargo.toml @@ -20,6 +20,7 @@ core = { path = "../libcore" } libc = { path = "../rustc/libc_shim" } rand = { path = "../librand" } compiler_builtins = { path = "../libcompiler_builtins" } +profiler_builtins = { path = "../libprofiler_builtins", optional = true } std_unicode = { path = "../libstd_unicode" } unwind = { path = "../libunwind" } @@ -43,3 +44,4 @@ debug-jemalloc = ["alloc_jemalloc/debug"] jemalloc = ["alloc_jemalloc"] force_alloc_system = [] panic-unwind = ["panic_unwind"] +profiler = ["profiler_builtins"] |