about summary refs log tree commit diff
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorJosh Stone <jistone@redhat.com>2019-01-16 09:59:03 -0800
committerJosh Stone <jistone@redhat.com>2019-01-25 15:39:54 -0800
commitdf0466d0bb807a7266cc8ac9931cd43b3e84b62e (patch)
tree5e0ec889065b1aea33f6bf9630d8f70003816f46 /COPYRIGHT
parentbf669d1e3295bc688f71b8c91f48a6beaf895f67 (diff)
downloadrust-df0466d0bb807a7266cc8ac9931cd43b3e84b62e.tar.gz
rust-df0466d0bb807a7266cc8ac9931cd43b3e84b62e.zip
Rebase to the llvm-project monorepo
The new git submodule src/llvm-project is a monorepo replacing src/llvm
and src/tools/{clang,lld,lldb}.  This also serves as a rebase for these
projects to the new 8.x branch from trunk.

The src/llvm-emscripten fork is unchanged for now.
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT6
1 files changed, 3 insertions, 3 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 6596c5a3d9a..dc9abf84b8e 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -23,7 +23,7 @@ The Rust Project includes packages written by third parties.
 The following third party packages are included, and carry
 their own copyright notices and license terms:
 
-* LLVM. Code for this package is found in src/llvm.
+* LLVM. Code for this package is found in src/llvm-project.
 
     Copyright (c) 2003-2013 University of Illinois at
     Urbana-Champaign.  All rights reserved.
@@ -73,8 +73,8 @@ their own copyright notices and license terms:
     OTHER DEALINGS WITH THE SOFTWARE.
 
 * Additional libraries included in LLVM carry separate
-  BSD-compatible licenses. See src/llvm/LICENSE.txt for
-  details.
+  BSD-compatible licenses. See src/llvm-project/llvm/LICENSE.TXT
+  for details.
 
 * compiler-rt, in src/compiler-rt is dual licensed under
   LLVM's license and MIT: