summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2016-11-16 12:31:19 -0800
committerAlex Crichton <alex@alexcrichton.com>2016-12-07 00:30:23 -0800
commit0e272de69f4a9c889e5f1a024a88b3e1f60cb6c5 (patch)
tree562faa1f54ff105d8b3e2ad6f64ab1efb5be4648 /configure
parentAuto merge of #38144 - clarcharr:redundant, r=alexcrichton (diff)
downloadgrust-0e272de69f4a9c889e5f1a024a88b3e1f60cb6c5.tar.gz
grust-0e272de69f4a9c889e5f1a024a88b3e1f60cb6c5.tar.bz2
grust-0e272de69f4a9c889e5f1a024a88b3e1f60cb6c5.tar.xz
mk: Switch rustbuild to the default build system
This commit switches the default build system for Rust from the makefiles to rustbuild. The rustbuild build system has been in development for almost a year now and has become quite mature over time. This commit is an implementation of the proposal on [internals] which slates deletion of the makefiles on 2016-01-02. [internals]: https://internals.rust-lang.org/t/proposal-for-promoting-rustbuild-to-official-status/4368 This commit also updates various documentation in `README.md`, `CONTRIBUTING.md`, `src/bootstrap/README.md`, and throughout the source code of rustbuild itself. Closes #37858
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure39
1 files changed, 28 insertions, 11 deletions
diff --git a/configure b/configure
index 483471604c..a287291c28 100755
--- a/configure
+++ b/configure
@@ -631,7 +631,7 @@ opt stage0-landing-pads 1 "enable landing pads during bootstrap with stage0"
631opt dist-host-only 0 "only install bins for the host architecture" 631opt dist-host-only 0 "only install bins for the host architecture"
632opt inject-std-version 1 "inject the current compiler version of libstd into programs" 632opt inject-std-version 1 "inject the current compiler version of libstd into programs"
633opt llvm-version-check 1 "check if the LLVM version is supported, build anyway" 633opt llvm-version-check 1 "check if the LLVM version is supported, build anyway"
634opt rustbuild 0 "use the rust and cargo based build system" 634opt rustbuild 1 "use the rust and cargo based build system"
635opt codegen-tests 1 "run the src/test/codegen tests" 635opt codegen-tests 1 "run the src/test/codegen tests"
636opt option-checking 1 "complain about unrecognized options in this configure script" 636opt option-checking 1 "complain about unrecognized options in this configure script"
637opt ninja 0 "build LLVM using the Ninja generator (for MSVC, requires building in the correct environment)" 637opt ninja 0 "build LLVM using the Ninja generator (for MSVC, requires building in the correct environment)"
@@ -664,11 +664,11 @@ valopt armv7-linux-androideabi-ndk "" "armv7-linux-androideabi NDK standalone pa
664valopt aarch64-linux-android-ndk "" "aarch64-linux-android NDK standalone path" 664valopt aarch64-linux-android-ndk "" "aarch64-linux-android NDK standalone path"
665valopt nacl-cross-path "" "NaCl SDK path (Pepper Canary is recommended). Must be absolute!" 665valopt nacl-cross-path "" "NaCl SDK path (Pepper Canary is recommended). Must be absolute!"
666valopt musl-root "/usr/local" "MUSL root installation directory (deprecated)" 666valopt musl-root "/usr/local" "MUSL root installation directory (deprecated)"
667valopt musl-root-x86_64 "/usr/local" "x86_64-unknown-linux-musl install directory" 667valopt musl-root-x86_64 "" "x86_64-unknown-linux-musl install directory"
668valopt musl-root-i686 "/usr/local" "i686-unknown-linux-musl install directory" 668valopt musl-root-i686 "" "i686-unknown-linux-musl install directory"
669valopt musl-root-arm "/usr/local" "arm-unknown-linux-musleabi install directory" 669valopt musl-root-arm "" "arm-unknown-linux-musleabi install directory"
670valopt musl-root-armhf "/usr/local" "arm-unknown-linux-musleabihf install directory" 670valopt musl-root-armhf "" "arm-unknown-linux-musleabihf install directory"
671valopt musl-root-armv7 "/usr/local" "armv7-unknown-linux-musleabihf install directory" 671valopt musl-root-armv7 "" "armv7-unknown-linux-musleabihf install directory"
672valopt extra-filename "" "Additional data that is hashed and passed to the -C extra-filename flag" 672valopt extra-filename "" "Additional data that is hashed and passed to the -C extra-filename flag"
673 673
674if [ -e ${CFG_SRC_DIR}.git ] 674if [ -e ${CFG_SRC_DIR}.git ]
@@ -1374,7 +1374,7 @@ then
1374 fi 1374 fi
1375fi 1375fi
1376 1376
1377if [ -z "$CFG_ENABLE_RUSTBUILD" ]; then 1377if [ -n "$CFG_DISABLE_RUSTBUILD" ]; then
1378 1378
1379 step_msg "making directories" 1379 step_msg "making directories"
1380 1380
@@ -1474,7 +1474,7 @@ fi
1474step_msg "configuring submodules" 1474step_msg "configuring submodules"
1475 1475
1476# Have to be in the top of src directory for this 1476# Have to be in the top of src directory for this
1477if [ -z "$CFG_DISABLE_MANAGE_SUBMODULES" ] && [ -z "$CFG_ENABLE_RUSTBUILD" ] 1477if [ -z "$CFG_DISABLE_MANAGE_SUBMODULES" ] && [ -n "$CFG_DISABLE_RUSTBUILD" ]
1478then 1478then
1479 cd ${CFG_SRC_DIR} 1479 cd ${CFG_SRC_DIR}
1480 1480
@@ -1546,7 +1546,7 @@ do
1546 ;; 1546 ;;
1547 esac 1547 esac
1548 1548
1549 if [ -n "$CFG_ENABLE_RUSTBUILD" ] 1549 if [ -z "$CFG_DISABLE_RUSTBUILD" ]
1550 then 1550 then
1551 msg "not configuring LLVM, rustbuild in use" 1551 msg "not configuring LLVM, rustbuild in use"
1552 do_reconfigure=0 1552 do_reconfigure=0
@@ -1871,7 +1871,7 @@ do
1871 putvar $CFG_LLVM_INST_DIR 1871 putvar $CFG_LLVM_INST_DIR
1872done 1872done
1873 1873
1874if [ -n "$CFG_ENABLE_RUSTBUILD" ] 1874if [ -z "$CFG_DISABLE_RUSTBUILD" ]
1875then 1875then
1876 INPUT_MAKEFILE=src/bootstrap/mk/Makefile.in 1876 INPUT_MAKEFILE=src/bootstrap/mk/Makefile.in
1877else 1877else
@@ -1890,5 +1890,22 @@ else
1890 step_msg "complete" 1890 step_msg "complete"
1891fi 1891fi
1892 1892
1893msg "run \`make help\`" 1893if [ -z "$CFG_DISABLE_RUSTBUILD" ]; then
1894 msg "NOTE you have now configured rust to use a rewritten build system"
1895 msg " called rustbuild, and as a result this may have bugs that "
1896 msg " you did not see before. If you experience any issues you can"
1897 msg " go back to the old build system with --disable-rustbuild and"
1898 msg " please feel free to report any bugs!"
1899 msg ""
1900 msg "run \`python x.py --help\`"
1901else
1902 warn "the makefile-based build system is deprecated in favor of rustbuild"
1903 msg ""
1904 msg "It is recommended you avoid passing --disable-rustbuild to get your"
1905 msg "build working as the makefiles will be deleted on 2017-02-02. If you"
1906 msg "encounter bugs with rustbuild please file issues against rust-lang/rust"
1907 msg ""
1908 msg "run \`make help\`"
1909fi
1910
1894msg 1911msg