Skip to content

Commit d2054db

Browse files
committed
Disable tidy license checker for cg_gcc until it's deps are vendored
1 parent 4edd748 commit d2054db

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

src/tools/tidy/src/deps.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ pub(crate) const WORKSPACES: &[(&str, ExceptionList, Option<(&[&str], &[&str])>)
5353
Some((&["rustc_codegen_cranelift"], PERMITTED_CRANELIFT_DEPENDENCIES)),
5454
),
5555
// tidy-alphabetical-start
56-
("compiler/rustc_codegen_gcc", EXCEPTIONS_GCC, None),
56+
//("compiler/rustc_codegen_gcc", EXCEPTIONS_GCC, None), // FIXME uncomment once all deps are vendored
5757
//("library/backtrace", &[], None), // FIXME uncomment once rust-lang/backtrace#562 lands
5858
//("library/portable-simd", &[], None), // FIXME uncomment once rust-lang/portable-simd#363 has been synced back to the rust repo
5959
//("library/stdarch", EXCEPTIONS_STDARCH, None), // FIXME uncomment once rust-lang/stdarch#1462 lands
@@ -160,12 +160,15 @@ const EXCEPTIONS_CRANELIFT: ExceptionList = &[
160160
// tidy-alphabetical-end
161161
];
162162

163+
// FIXME uncomment once all deps are vendored
164+
/*
163165
const EXCEPTIONS_GCC: ExceptionList = &[
164166
// tidy-alphabetical-start
165167
("gccjit", "GPL-3.0"),
166168
("gccjit_sys", "GPL-3.0"),
167169
// tidy-alphabetical-end
168170
];
171+
*/
169172

170173
const EXCEPTIONS_BOOTSTRAP: ExceptionList = &[
171174
("ryu", "Apache-2.0 OR BSL-1.0"), // through serde. BSL is not acceptble, but we use it under Apache-2.0

src/tools/tidy/src/extdeps.rs

-9
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,6 @@ pub fn check(root: &Path, bad: &mut bool) {
3434

3535
// Ensure source is allowed.
3636
if !ALLOWED_SOURCES.contains(&&*source) {
37-
if workspace == "compiler/rustc_codegen_gcc" {
38-
// FIXME stop using git dependencies for rustc_codegen_gcc?
39-
if source
40-
== "\"git+https://github.com/antoyo/gccjit.rs#d6e52626cfc6f487094a5d5ac66302baf3439984\""
41-
{
42-
continue;
43-
}
44-
}
45-
4637
tidy_error!(bad, "invalid source: {}", source);
4738
}
4839
}

0 commit comments

Comments
 (0)