diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-02-07 22:54:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-07 22:54:25 -0500 |
| commit | 6fb57bf13fcc316ce622af70d3922ae5d811928d (patch) | |
| tree | 9768f794e9c3f6afd5922540a2f1aed98618f96b /src/librustc_llvm/lib.rs | |
| parent | 3d8fa5af213e24e83ded9dbed15572045c27fbbf (diff) | |
| parent | c8e0d04878f38e8a91e7a6196fb18878da208887 (diff) | |
| download | rust-6fb57bf13fcc316ce622af70d3922ae5d811928d.tar.gz rust-6fb57bf13fcc316ce622af70d3922ae5d811928d.zip | |
Rollup merge of #39431 - alexcrichton:no-more-makefiles, r=brson
Delete the makefile build system This PR deletes the makefile build system in favor of the rustbuild build system. The beta has now been branched so 1.16 will continue to be buildable from the makefiles, but going forward 1.17 will only be buildable with rustbuild. Rustbuild has been the default build system [since 1.15.0](https://github.com/rust-lang/rust/pull/37817) and the makefiles were [proposed for deletion](https://internals.rust-lang.org/t/proposal-for-promoting-rustbuild-to-official-status/4368) at this time back in November of last year. And now with the deletion of these makefiles we can start getting those sweet sweet improvements of using crates.io crates in the compiler!
Diffstat (limited to 'src/librustc_llvm/lib.rs')
| -rw-r--r-- | src/librustc_llvm/lib.rs | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/librustc_llvm/lib.rs b/src/librustc_llvm/lib.rs index b1615b9e38b..f300bf16145 100644 --- a/src/librustc_llvm/lib.rs +++ b/src/librustc_llvm/lib.rs @@ -422,13 +422,3 @@ impl Drop for OperandBundleDef { } } } - -// The module containing the native LLVM dependencies, generated by the build system -// Note that this must come after the rustllvm extern declaration so that -// parts of LLVM that rustllvm depends on aren't thrown away by the linker. -// Works to the above fix for #15460 to ensure LLVM dependencies that -// are only used by rustllvm don't get stripped by the linker. -#[cfg(not(cargobuild))] -mod llvmdeps { - include! { env!("CFG_LLVM_LINKAGE_FILE") } -} |
