dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Default llvm.clean-rebuild to false

This commit is contained in:
Vadim Petrochenkov 2017-03-08 16:22:08 +03:00
parent 9b8b3b2b03
commit 362aa9a317
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@ -437,6 +437,7 @@ opt local-rust 0 "use an installed rustc rather than downloading a snapshot"
opt local-rebuild 0 "assume local-rust matches the current version, for rebuilds; implies local-rust, and is implied if local-rust already matches the current version" opt local-rebuild 0 "assume local-rust matches the current version, for rebuilds; implies local-rust, and is implied if local-rust already matches the current version"
opt llvm-static-stdcpp 0 "statically link to libstdc++ for LLVM" opt llvm-static-stdcpp 0 "statically link to libstdc++ for LLVM"
opt llvm-link-shared 0 "prefer shared linking to LLVM (llvm-config --link-shared)" opt llvm-link-shared 0 "prefer shared linking to LLVM (llvm-config --link-shared)"
opt llvm-clean-rebuild 0 "delete LLVM build directory on rebuild"
opt rpath 1 "build rpaths into rustc itself" opt rpath 1 "build rpaths into rustc itself"
opt stage0-landing-pads 1 "enable landing pads during bootstrap with stage0" opt stage0-landing-pads 1 "enable landing pads during bootstrap with stage0"
# This is used by the automation to produce single-target nightlies # This is used by the automation to produce single-target nightlies

2
src/bootstrap/config.rs
View File

@ -243,7 +243,6 @@ impl Config {
pub fn parse(build: &str, file: Option<PathBuf>) -> Config { pub fn parse(build: &str, file: Option<PathBuf>) -> Config {
let mut config = Config::default(); let mut config = Config::default();
config.llvm_optimize = true; config.llvm_optimize = true;
config.llvm_clean_rebuild = true;
config.use_jemalloc = true; config.use_jemalloc = true;
config.backtrace = true; config.backtrace = true;
config.rust_optimize = true; config.rust_optimize = true;
@ -443,6 +442,7 @@ impl Config {
("LLVM_VERSION_CHECK", self.llvm_version_check), ("LLVM_VERSION_CHECK", self.llvm_version_check),
("LLVM_STATIC_STDCPP", self.llvm_static_stdcpp), ("LLVM_STATIC_STDCPP", self.llvm_static_stdcpp),
("LLVM_LINK_SHARED", self.llvm_link_shared), ("LLVM_LINK_SHARED", self.llvm_link_shared),
("LLVM_CLEAN_REBUILD", self.llvm_clean_rebuild),
("OPTIMIZE", self.rust_optimize), ("OPTIMIZE", self.rust_optimize),
("DEBUG_ASSERTIONS", self.rust_debug_assertions), ("DEBUG_ASSERTIONS", self.rust_debug_assertions),
("DEBUGINFO", self.rust_debuginfo), ("DEBUGINFO", self.rust_debuginfo),

8
src/bootstrap/config.toml.example
View File

@ -62,11 +62,9 @@
#link-jobs = 0 #link-jobs = 0
# Delete LLVM build directory on LLVM rebuild. # Delete LLVM build directory on LLVM rebuild.
# This option's default (`true`) is optimized for CI needs, and CI wants to # This option defaults to `false` for local development, but CI may want to
# perform clean full builds only (possibly accelerated by (s)ccache). # always perform clean full builds (possibly accelerated by (s)ccache).
# You may want to override this option for local builds to enable partial LLVM #clean-rebuild = false
# rebuilds.
#clean-rebuild = true
# ============================================================================= # =============================================================================
# General build configuration options # General build configuration options

1
src/ci/run.sh
View File

@ -28,6 +28,7 @@ RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-quiet-tests"
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-manage-submodules" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-manage-submodules"
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-locked-deps" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-locked-deps"
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-cargo-openssl-static" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-cargo-openssl-static"
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-clean-rebuild"
if [ "$DIST_SRC" = "" ]; then if [ "$DIST_SRC" = "" ]; then
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-dist-src" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-dist-src"