Skip to content

Commit 85b1bdb

Browse files
committed
Update licensing information after repository refactoring
In order to disambiguate things now that libm is part of the compiler-builtins repository, do the following: * Mention libm in LICENSE.txt * Clarify the default license for crates other than libm and compiler-builtins * Add an explicit license field to Cargo.toml for all other crates
1 parent e823bb7 commit 85b1bdb

File tree

7 files changed

+17
-6
lines changed

7 files changed

+17
-6
lines changed

LICENSE.txt

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
compiler-builtins as a whole is available for use under both the MIT license
1+
The compiler-builtins crate is available for use under both the MIT license
22
and the Apache-2.0 license with the LLVM exception (MIT AND Apache-2.0 WITH
33
LLVM-exception).
44

5-
As a contributor, you agree that your code can be used under either the MIT
6-
license, or the Apache-2.0 license, or the Apache-2.0 license with the LLVM
7-
exception.
5+
The libm crate is available for use under the MIT license.
6+
7+
As a contributor, you agree that your code may be used under any of the
8+
following: the MIT license, the Apache-2.0 license, or the Apache-2.0 license
9+
with the LLVM exception. In other words, original (non-derivative) work is
10+
licensed under MIT OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception. This is
11+
the default license for all other source in this repository.
812

913
Text of the relevant licenses is provided below:
1014

@@ -263,8 +267,9 @@ license:
263267
* Work derived from compiler-rt after 2019-01-19 is usable under the
264268
Apache-2.0 license with the LLVM exception.
265269

266-
* The bundled `math` module is from rust-lang/libm, usable under the MIT
267-
license. See https://github.com/rust-lang/libm for details.
270+
* The bundled `math` module is from the libm crate, usable under the MIT
271+
license. For further details and copyrights, see see libm/LICENSE.txt at
272+
https://github.com/rust-lang/compiler-builtins.
268273

269274
Additionally, some source files may contain comments with specific copyrights
270275
or licenses.

builtins-test-intrinsics/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name = "builtins-test-intrinsics"
33
version = "0.1.0"
44
edition = "2021"
55
publish = false
6+
license = "MIT OR Apache-2.0"
67

78
[dependencies]
89
compiler_builtins = { path = "../compiler-builtins", features = ["compiler-builtins"]}

builtins-test/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ version = "0.1.0"
44
authors = ["Alex Crichton <[email protected]>"]
55
edition = "2024"
66
publish = false
7+
license = "MIT AND Apache-2.0 WITH LLVM-exception AND (MIT OR Apache-2.0)"
78

89
[dependencies]
910
# For fuzzing tests we want a deterministic seedable RNG. We also eliminate potential

crates/libm-macros/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name = "libm-macros"
33
version = "0.1.0"
44
edition = "2024"
55
publish = false
6+
license = "MIT OR Apache-2.0"
67

78
[lib]
89
proc-macro = true

crates/musl-math-sys/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name = "musl-math-sys"
33
version = "0.1.0"
44
edition = "2024"
55
publish = false
6+
license = "MIT OR Apache-2.0"
67

78
[dependencies]
89

crates/util/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name = "util"
33
version = "0.1.0"
44
edition = "2024"
55
publish = false
6+
license = "MIT OR Apache-2.0"
67

78
[features]
89
default = ["build-musl", "build-mpfr", "unstable-float"]

libm-test/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name = "libm-test"
33
version = "0.1.0"
44
edition = "2024"
55
publish = false
6+
license = "MIT OR Apache-2.0"
67

78
[features]
89
default = ["build-mpfr", "build-musl", "unstable-float"]

0 commit comments

Comments
 (0)