Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make ignore-git true by default when channel is dev #43895

Merged
merged 9 commits into from
Aug 30, 2017
Merged

make ignore-git true by default when channel is dev #43895

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c3b27d5
make ignore-git true by default when channel is dev
JeremySorensen Aug 16, 2017
5e472c2
fix typo in git-ignore comment
JeremySorensen Aug 17, 2017
bdb7901
initialize ignore-git to false
JeremySorensen Aug 17, 2017
fb30dd7
getting rid of all changes due to this PR thus far, starting from a c…
JeremySorensen Aug 28, 2017
5009a22
use an optional bool to keep track of ignore-git setting, if not spec…
JeremySorensen Aug 29, 2017
68aab69
add ignore-git=true option to RUST_CONFIGURE_ARGS
JeremySorensen Aug 29, 2017
d24ee23
change option for RUST_CONFIGURE_ARGS to ignore-git=false
JeremySorensen Aug 29, 2017
873a05e
allow value of key/value pair argument to set option be boolean
JeremySorensen Aug 30, 2017
4f591a4
fix option for RUST_CONFIGURE_ARGS to be rust.ignore-git=false
JeremySorensen Aug 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion config.toml.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,10 @@
#codegen-tests = true

# Flag indicating whether git info will be retrieved from .git automatically.
#ignore-git = false
# Having the git information can cause a lot of rebuilds during development.
# Note: If this attribute is not explicity set (e.g. it left commented out) it
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should probably be "if left commented out".

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes you are right

# will default to true if channel = "dev", but will default to false otherwise.
#ignore-git = true

# =============================================================================
# Options for specific targets
Expand Down
7 changes: 6 additions & 1 deletion src/bootstrap/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ impl Config {
config.rust_codegen_units = 1;
config.channel = "dev".to_string();
config.codegen_tests = true;
config.ignore_git = false;
config.ignore_git = true;
config.rust_dist_src = true;

config.on_fail = flags.on_fail;
Expand Down Expand Up @@ -419,7 +419,12 @@ impl Config {
set(&mut config.use_jemalloc, rust.use_jemalloc);
set(&mut config.backtrace, rust.backtrace);
set(&mut config.channel, rust.channel.clone());

// on the dev channel, ignore_git should be true by default
// on other channels it should be false by default
config.ignore_git = config.channel == "dev";
set(&mut config.ignore_git, rust.ignore_git);

config.rustc_default_linker = rust.default_linker.clone();
config.rustc_default_ar = rust.default_ar.clone();
config.musl_root = rust.musl_root.clone().map(PathBuf::from);
Expand Down