user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable tidy license checker for cg_gcc until it's deps are vendored

Browse source
This commit is contained in:
bjorn3 2023-08-28 14:16:27 +00:00
parent 4edd74821a
commit d2054db3eb
2 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/tools/tidy/src/deps.rs
View file

@ -53,7 +53,7 @@ pub(crate) const WORKSPACES: &[(&str, ExceptionList, Option<(&[&str], &[&str])>)
Some((&["rustc_codegen_cranelift"], PERMITTED_CRANELIFT_DEPENDENCIES)),
),
// tidy-alphabetical-start
("compiler/rustc_codegen_gcc", EXCEPTIONS_GCC, None),
//("compiler/rustc_codegen_gcc", EXCEPTIONS_GCC, None), // FIXME uncomment once all deps are vendored
//("library/backtrace", &[], None), // FIXME uncomment once rust-lang/backtrace#562 lands
//("library/portable-simd", &[], None), // FIXME uncomment once rust-lang/portable-simd#363 has been synced back to the rust repo
//("library/stdarch", EXCEPTIONS_STDARCH, None), // FIXME uncomment once rust-lang/stdarch#1462 lands
@ -160,12 +160,15 @@ const EXCEPTIONS_CRANELIFT: ExceptionList = &[
// tidy-alphabetical-end
];
// FIXME uncomment once all deps are vendored
/*
const EXCEPTIONS_GCC: ExceptionList = &[
// tidy-alphabetical-start
("gccjit", "GPL-3.0"),
("gccjit_sys", "GPL-3.0"),
// tidy-alphabetical-end
];
*/
const EXCEPTIONS_BOOTSTRAP: ExceptionList = &[
("ryu", "Apache-2.0 OR BSL-1.0"), // through serde. BSL is not acceptble, but we use it under Apache-2.0

9
src/tools/tidy/src/extdeps.rs
View file

@ -34,15 +34,6 @@ pub fn check(root: &Path, bad: &mut bool) {
// Ensure source is allowed.
if !ALLOWED_SOURCES.contains(&&*source) {
if workspace == "compiler/rustc_codegen_gcc" {
// FIXME stop using git dependencies for rustc_codegen_gcc?
if source
== "\"git+https://github.com/antoyo/gccjit.rs#d6e52626cfc6f487094a5d5ac66302baf3439984\""
{
continue;
}
}
tidy_error!(bad, "invalid source: {}", source);
}
}