Skip to content

Commit 5d87c36

Browse files
author
2b57
committed
stage1 kind of builds
1 parent 0d46926 commit 5d87c36

File tree

8 files changed

+59
-20
lines changed

8 files changed

+59
-20
lines changed
Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,22 @@
1-
PYTHON_SINGLE_TARGET="python3_9"
2-
1+
# Clang needs this
2+
BOOTSTRAP_USE="${BOOTSTRAP_USE} python_single_target_python3_9"
3+
4+
# sys-devel/llvm
5+
BOOTSTRAP_USE="${BOOTSTRAP_USE} -gold"
6+
7+
# sys-devel/clang, sys-devel/clang-runtime, sys-libs/llvm-libunwind, sys-libs/libcxx, sys-libs/libcxxabi
8+
BOOTSTRAP_USE="${BOOTSTRAP_USE} compiler-rt clang libunwind"
9+
10+
# sys-devel/clang
11+
BOOTSTRAP_USE="${BOOTSTRAP_USE} default-compiler-rt default-lld default-libcxx llvm-libunwind"
12+
13+
# sys-devel/clang-runtime
14+
# sanitizers are disabled for now
15+
BOOTSTRAP_USE="${BOOTSTRAP_USE} libcxx -sanitize"
16+
17+
# sys-libs/libcxxabi
18+
BOOTSTRAP_USE="${BOOTSTRAP_USE} libcxxabi"
19+
20+
# sys-devel/gcc
21+
# only libgcc and stdlib are needed
22+
BOOTSTRAP_USE="${BOOTSTRAP_USE} -fortran"
Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,13 @@
1-
virtual/toolchain
2-
virtual/binutils
1+
# will be pulled by stage1
2+
sys-libs/compiler-rt
3+
sys-libs/libcxxabi
4+
sys-libs/libcxx
5+
sys-devel/llvm
6+
sys-devel/lld
7+
sys-devel/clang
8+
sys-libs/llvm-libunwind
9+
10+
# GCC is required for stage1, since
11+
# by default everything is linked to it
12+
#-sys-devel/gcc
13+
#-sys-devel/binutils
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
TOOLCHAIN="Clang"
2-
BINUTILS="LLVM"
3-
41
CC="clang"
52
CXX="clang++"
63
AR="llvm-ar"
74
NM="llvm-nm"
85
LD="lld"
9-
RANLIB="llvm-ranlib"
6+
RANLIB="llvm-ranlib"
7+
8+
# curl needed by cmake
9+
BOOTSTRAP_USE="$BOOTSTRAP_USE ssl curl_ssl_openssl"

profiles/features/clang/package.mask

Lines changed: 0 additions & 7 deletions
This file was deleted.

profiles/features/bootstrap/package.use renamed to profiles/features/clang/package.use

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ sys-devel/clang-runtime compiler-rt libcxx -sanitize
1111

1212
sys-libs/libcxx libunwind libcxxabi
1313
sys-libs/libcxxabi libunwind
14-
sys-libs/llvm-libunwind compiler-rt
14+
sys-libs/llvm-libunwind compiler-rt
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1+
# now part of @system set
12
*sys-devel/lld
23
*sys-devel/llvm
34
*sys-devel/clang
45
*sys-libs/libcxx
56
*sys-libs/libcxxabi
67
*sys-libs/compiler-rt
78
*sys-libs/llvm-libunwind
9+
10+
# remove standard toolchain
11+
-*sys-devel/gcc
12+
-*sys-devel/binutils
Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1-
# this should bring LLVM
2-
virtual/binutils
3-
virtual/toolchain
1+
# will be pulled by stage1
2+
sys-libs/compiler-rt
3+
sys-libs/libcxxabi
4+
sys-libs/libcxx
5+
sys-devel/llvm
6+
sys-devel/lld
7+
sys-devel/clang
8+
sys-libs/llvm-libunwind
9+
10+
# since GCC & binutils were present in
11+
# stage1 for bootstrap, remove them here
12+
-sys-devel/gcc
13+
-sys-devel/binutils

specs/clang/musl/stage2.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version_stamp: clang-musl-@TIMESTAMP@
44
rel_type: clang-musl
55
profile: toolchain-clang:linux/amd64/clang/musl
66
snapshot: @TIMESTAMP@
7-
source_subpath: musl/stage3-amd64-musl-@TIMESTAMP@
7+
source_subpath: clang-musl/stage1-amd64-clang-musl-@TIMESTAMP@
88
chost: x86_64-gentoo-linux-musl
99
portage_prefix: releng
1010
portage_overlay: /var/db/repos/musl /var/db/repos/toolchain-clang

0 commit comments

Comments
 (0)