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.
This commit is contained in:
Jonathan Pallant (Ferrous Systems) 2023-11-29 13:11:12 +00:00
parent c1577e5fc8
commit efa4416ef3
No known key found for this signature in database

View file

@ -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