fix newlines, mask LLVM 13

2b57 · 2b57 · commit b5abc1977c96 · 2021-12-04T00:06:49.000+01:00
diff --git a/profiles/features/bootstrap/make.defaults b/profiles/features/bootstrap/make.defaults
@@ -22,4 +22,4 @@ BOOTSTRAP_USE="${BOOTSTRAP_USE} libcxxabi"
 BOOTSTRAP_USE="${BOOTSTRAP_USE} -fortran"
 
 # llvm & clang: explicitly disable all extra targets, otherwise linking stage2 fails
-BOOTSTRAP_USE="${BOOTSTRAP_USE} -llvm_targets_BPF -llvm_targets_AMDGPU -llvm_targets_NVPTX -llvm_targets_BPF"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} -llvm_targets_BPF -llvm_targets_AMDGPU -llvm_targets_NVPTX -llvm_targets_BPF"
diff --git a/profiles/features/bootstrap/package.mask b/profiles/features/bootstrap/package.mask
@@ -0,0 +1,16 @@
+# mask LLVM 13
+
+>sys-devel/llvm-12.0.1
+>sys-devel/llvm-common-12.0.1
+
+>sys-libs/compiler-rt-12.0.1
+>sys-libs/compiler-rt-sanitizers-12.0.1
+
+>sys-devel/clang-12.0.1
+>sys-devel/clang-common-12.0.1
+>sys-devel/clang-runtime-12.0.1
+
+>sys-devel/lld-12.0.1
+>sys-libs/libcxx-12.0.1
+>sys-libs/libcxxabi-12.0.1
+>sys-libs/llvm-libunwind-12.0.1
diff --git a/profiles/features/bootstrap/packages.build b/profiles/features/bootstrap/packages.build
@@ -10,4 +10,4 @@ sys-libs/llvm-libunwind
 # GCC is required for stage1, since
 # by default everything is linked to it
 #-sys-devel/gcc
-#-sys-devel/binutils
+#-sys-devel/binutils
diff --git a/profiles/features/clang/package.use b/profiles/features/clang/package.use
@@ -11,4 +11,4 @@ sys-devel/clang-runtime compiler-rt libcxx -sanitize
 
 sys-libs/libcxx libunwind libcxxabi
 sys-libs/libcxxabi libunwind
-sys-libs/llvm-libunwind compiler-rt
+sys-libs/llvm-libunwind compiler-rt
diff --git a/profiles/features/clang/packages b/profiles/features/clang/packages
@@ -7,6 +7,6 @@
 *sys-libs/compiler-rt
 *sys-libs/llvm-libunwind
 
-# remove standard toolchain
+# remove GNU toolchain
 -*sys-devel/gcc
--*sys-devel/binutils
+-*sys-devel/binutils
diff --git a/profiles/features/clang/packages.build b/profiles/features/clang/packages.build
@@ -10,4 +10,4 @@ sys-libs/llvm-libunwind
 # since GCC & binutils were present in
 # stage1 for bootstrap, remove them here
 -sys-devel/gcc
--sys-devel/binutils
+-sys-devel/binutils
diff --git a/profiles/features/clang/parent b/profiles/features/clang/parent
diff --git a/profiles/features/lto/use.force b/profiles/features/lto/use.force
@@ -1 +1 @@
-lto
+lto
diff --git a/profiles/linux/amd64/clang/parent b/profiles/linux/amd64/clang/parent
@@ -1,2 +1,3 @@
 gentoo:default/linux/amd64/17.1
+../../../features/bootstrap
 ../../../features/clang
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
@@ -1,6 +1,6 @@
 # used ONLY to build stage1
-amd64		linux/amd64/bootstrap		dev
-amd64		linux/amd64/bootstrap/musl	dev
+amd64		linux/amd64/bootstrap		exp
+amd64		linux/amd64/bootstrap/musl	exp
 
 # user selectable
 amd64		linux/amd64/clang	    	exp

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`gentoo:default/linux/amd64/17.1`
	`2`	`+../../../features/bootstrap`
`2`	`3`	`../../../features/clang`