diff options
| author | bors <bors@rust-lang.org> | 2017-06-14 08:46:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-06-14 08:46:14 +0000 |
| commit | dfa7e21e4ee555d04c0fb86069f5acffee3550ad (patch) | |
| tree | 8e29f75d4d8a37b5205a1ae76c9f0a4588ddec43 /src/libstd | |
| parent | e40ef964fe491b19c22dfb8dd36d1eab14223c36 (diff) | |
| parent | 5c084fd8edd986d8a4bd9ff37b303f8777623a56 (diff) | |
| download | rust-dfa7e21e4ee555d04c0fb86069f5acffee3550ad.tar.gz rust-dfa7e21e4ee555d04c0fb86069f5acffee3550ad.zip | |
Auto merge of #42433 - marco-c:profiling, r=alexcrichton
Build instruction profiler runtime as part of compiler-rt r? @alexcrichton This is #38608 with some fixes. Still missing: - [x] testing with profiler enabled on some builders (on which ones? Should I add the option to some of the already existing configurations, or create a new configuration?); - [x] enabling distribution (on which builders?); - [x] documentation.
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"] |