diff options
| author | Jonathan Pallant (Ferrous Systems) <jonathan.pallant@ferrous-systems.com> | 2023-11-29 13:11:12 +0000 |
|---|---|---|
| committer | Jonathan Pallant (Ferrous Systems) <jonathan.pallant@ferrous-systems.com> | 2023-11-29 13:11:12 +0000 |
| commit | efa4416ef3fd7242fbf4b5f939f80de38bd45dff (patch) | |
| tree | a4530cc69d11a516682380a7d48d5118c435b73f | |
| parent | c1577e5fc883596c1ed2b2b78b077eecba61603f (diff) | |
| download | rust-efa4416ef3fd7242fbf4b5f939f80de38bd45dff.tar.gz rust-efa4416ef3fd7242fbf4b5f939f80de38bd45dff.zip | |
Change LLVM reuse dep5 line to say AND.
The LLVM project is a combination of some NCSA licensed files and some Apache-2.0 WITH LLVM-exception licensed files, so you should follow both licences when using the combined work. Also clarified where I got the copyright years and git hash from.
| -rw-r--r-- | .reuse/dep5 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/.reuse/dep5 b/.reuse/dep5 index 55f46e3bc21..d982065eb4e 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -107,9 +107,15 @@ License: MIT OR Apache-2.0 # has a specific exception coded within it to ignore ./src/llvm-project so # any time LLVM is updated, please revisit this section. The copyrights are # taken from the relevant LLVM sub-folders: llvm, lld, lldb, compiler-rt and libunwind. +# +# The git hash for the CREDITS.TXT file is taken from the current git submodule +# commit for ./src/llvm-project. +# +# The copyright years were compiled by looking at all the relevant +# ./src/llvm-project/*/LICENSE.txt files Files: src/llvm-project/* Copyright: 2003-2019 by the contributors listed in [CREDITS.TXT](https://github.com/rust-lang/llvm-project/blob/7738295178045041669876bf32b0543ec8319a5c/llvm/CREDITS.TXT) 2010 Apple Inc 2003-2019 University of Illinois at Urbana-Champaign. -License: NCSA OR Apache-2.0 WITH LLVM-exception +License: NCSA AND Apache-2.0 WITH LLVM-exception |