about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbjorn3 <17426603+bjorn3@users.noreply.github.com>2023-08-28 14:16:27 +0000
committerbjorn3 <17426603+bjorn3@users.noreply.github.com>2023-10-10 12:47:26 +0000
commitd2054db3ebed4e955c901c3020fa3978b6eea97e (patch)
treeef0f3d2e6abe3c95ce99193df8ba12e87d9444e1
parent4edd74821af6e63369fe722d20fc6c689b27dbaf (diff)
downloadrust-d2054db3ebed4e955c901c3020fa3978b6eea97e.tar.gz
rust-d2054db3ebed4e955c901c3020fa3978b6eea97e.zip
Disable tidy license checker for cg_gcc until it's deps are vendored
-rw-r--r--src/tools/tidy/src/deps.rs5
-rw-r--r--src/tools/tidy/src/extdeps.rs9
2 files changed, 4 insertions, 10 deletions
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
index 07be91bbeb4..7ff5eb61fb3 100644
--- a/src/tools/tidy/src/deps.rs
+++ b/src/tools/tidy/src/deps.rs
@@ -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
diff --git a/src/tools/tidy/src/extdeps.rs b/src/tools/tidy/src/extdeps.rs
index 44d13043e46..ff71ca53725 100644
--- a/src/tools/tidy/src/extdeps.rs
+++ b/src/tools/tidy/src/extdeps.rs
@@ -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);
             }
         }