Skip to content

Delete bundled gcc libs on windows #1010

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

Merged
merged 2 commits into from
Dec 8, 2014
Merged

Delete bundled gcc libs on windows #1010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d8d6bb
Delete bundled gcc libs on windows
alexcrichton Dec 4, 2014
673d318
Bump libgit2 dep to hopefully fix win32
alexcrichton Dec 8, 2014
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
2 changes: 2 additions & 0 deletions .travis.install.deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ else
mv '{app}' rustc
# Don't use the bundled gcc, see rust-lang/rust#17442
rm -rf rustc/bin/rustlib/$triple/bin
# Don't use bundled gcc libs, see rust-lang/rust#19519
rm -rf rustc/bin/rustlib/$triple/libmingw*.a
rm -f rust-nightly-$triple.exe
fi

Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/cargo/sources/git/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ pub fn fetch(repo: &git2::Repository, url: &str,
let mut remote = try!(repo.remote_anonymous(url.as_slice(), refspec));
try!(remote.add_fetch("refs/tags/*:refs/tags/*"));
remote.set_callbacks(&mut cb);
try!(remote.fetch(None, None));
try!(remote.fetch(&["refs/tags/*:refs/tags/*", refspec], None, None));
Ok(())
})
}
2 changes: 1 addition & 1 deletion tests/test_cargo_build_auth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ Caused by:
",
addr = addr,
errmsg = if cfg!(windows) {
"Failed to send request: The connection with the server \
"failed to send request: The connection with the server \
was terminated abnormally\n"
} else {
"SSL error: [..]"
Expand Down
6 changes: 3 additions & 3 deletions tests/test_cargo_compile_git_deps.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ fn add(repo: &git2::Repository) {
}
let mut index = repo.index().unwrap();
index.add_all(&["*"], git2::ADD_DEFAULT, Some(|a: &[u8], _b: &[u8]| {
if s.iter().any(|s| s.path().as_vec() == a) {1} else {0}
if s.iter().any(|s| a.starts_with(s.path().as_vec())) {1} else {0}
})).unwrap();
index.write().unwrap();
}
Expand All @@ -53,7 +53,7 @@ fn add_submodule<'a>(repo: &'a git2::Repository, url: &str,
let subrepo = s.open().unwrap();
let mut origin = subrepo.find_remote("origin").unwrap();
origin.add_fetch("refs/heads/*:refs/heads/*").unwrap();
origin.fetch(None, None).unwrap();
origin.fetch(&[], None, None).unwrap();
origin.save().unwrap();
subrepo.checkout_head(None).unwrap();
s.add_finalize().unwrap();
Expand Down Expand Up @@ -979,7 +979,7 @@ test!(dep_with_changed_submodule {
let mut origin = subrepo.find_remote("origin").unwrap();
origin.set_url(git_project3.url().to_string().as_slice()).unwrap();
origin.add_fetch("refs/heads/*:refs/heads/*").unwrap();;
origin.fetch(None, None).unwrap();
origin.fetch(&[], None, None).unwrap();
origin.save().unwrap();
let id = subrepo.refname_to_id("refs/remotes/origin/master").unwrap();
let obj = subrepo.find_object(id, None).unwrap();
Expand Down