Skip to content

Commit 6fb57bf

Browse files
authored
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](#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!
2 parents 3d8fa5a + c8e0d04 commit 6fb57bf

File tree

124 files changed

+75
-8148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+75
-8148
lines changed

.travis.yml

-8
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ matrix:
3333
- env: IMAGE=x86_64-gnu-aux
3434
- env: IMAGE=x86_64-gnu-debug
3535
- env: IMAGE=x86_64-gnu-nopt
36-
- env: IMAGE=x86_64-gnu-make
3736
- env: IMAGE=x86_64-gnu-llvm-3.7 ALLOW_PR=1 RUST_BACKTRACE=1
3837
- env: IMAGE=x86_64-gnu-distcheck
3938
- env: IMAGE=x86_64-gnu-incremental
@@ -57,13 +56,6 @@ matrix:
5756
os: osx
5857
osx_image: xcode8.2
5958
install: *osx_install_sccache
60-
- env: >
61-
RUST_CHECK_TARGET=check
62-
RUST_CONFIGURE_ARGS=--build=x86_64-apple-darwin --disable-rustbuild
63-
SRC=.
64-
os: osx
65-
osx_image: xcode8.2
66-
install: *osx_install_sccache
6759
- env: >
6860
RUST_CHECK_TARGET=dist
6961
RUST_CONFIGURE_ARGS="--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-extended"

CONTRIBUTING.md

-5
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,6 @@ system internals, try asking in [`#rust-internals`][pound-rust-internals].
9393

9494
[bootstrap]: https://github.com/rust-lang/rust/tree/master/src/bootstrap/
9595

96-
> **Note**: the build system was recently rewritten from a jungle of makefiles
97-
> to the current incarnation you'll see in `src/bootstrap`. If you experience
98-
> bugs you can temporarily revert back to the makefiles with
99-
> `--disable-rustbuild` passed to `./configure`.
100-
10196
### Configuration
10297

10398
Before you can start building the compiler you need to configure the build for

Makefile.in

-297
This file was deleted.

appveyor.yml

-12
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ environment:
1515
SCRIPT: python x.py test --host i686-pc-windows-msvc --target i686-pc-windows-msvc && python x.py dist
1616
DEPLOY: 1
1717

18-
# MSVC makefiles
19-
- MSYS_BITS: 64
20-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --disable-rustbuild
21-
RUST_CHECK_TARGET: check
22-
2318
# MSVC cargotest
2419
- MSYS_BITS: 64
2520
NO_VENDOR: 1
@@ -58,13 +53,6 @@ environment:
5853
MINGW_DIR: mingw32
5954
DEPLOY: 1
6055

61-
- MSYS_BITS: 32
62-
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --disable-rustbuild
63-
RUST_CHECK_TARGET: check
64-
MINGW_URL: https://s3.amazonaws.com/rust-lang-ci
65-
MINGW_ARCHIVE: i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z
66-
MINGW_DIR: mingw32
67-
6856
- MSYS_BITS: 64
6957
SCRIPT: python x.py test && python x.py dist
7058
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-extended

0 commit comments

Comments
 (0)