Skip to content

Commit 14e1077

Browse files
committed
reconf
1 parent c7aa622 commit 14e1077

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

clang/pkg.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,9 @@ steps:
3333
cmake -S clang -B build -G Ninja \
3434
-DCMAKE_BUILD_TYPE=Release \
3535
-DCMAKE_INSTALL_PREFIX=/usr \
36-
-DCMAKE_SKIP_RPATH=ON \
3736
-DLLVM_INCLUDE_TESTS=OFF \
3837
-DLLVM_ENABLE_ASSERTIONS=OFF \
3938
-DCLANG_BUILT_STANDALONE=ON \
40-
-DBUILD_SHARED_LIBS=ON \
4139
-DCLANG_DEFAULT_PIE_ON_LINUX=ON \
4240
-DCLANG_LINK_CLANG_DYLIB=ON \
4341
-DENABLE_LINKER_BUILD_ID=ON \
@@ -48,7 +46,7 @@ steps:
4846
cmake --build build
4947
install:
5048
- |
51-
DESTDIR=/rootfs cmake --install build
49+
DESTDIR=/rootfs ninja -C build install-distribution
5250
finalize:
5351
- from: /rootfs
5452
to: /

lld/pkg.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,16 @@ steps:
4848
cmake -S lld -B build -G Ninja \
4949
-DCMAKE_BUILD_TYPE=Release \
5050
-DCMAKE_INSTALL_PREFIX=/usr \
51-
-DCMAKE_SKIP_RPATH=ON \
5251
-DLLVM_INCLUDE_TESTS=OFF \
5352
-DLLVM_ENABLE_ASSERTIONS=OFF \
5453
-DLLD_BUILT_STANDALONE=ON \
55-
-DBUILD_SHARED_LIBS=ON \
5654
-DLLVM_LINK_LLVM_DYLIB=ON
5755
build:
5856
- |
5957
cmake --build build
6058
install:
6159
- |
62-
DESTDIR=/rootfs cmake --install build
60+
DESTDIR=/rootfs ninja -C build install-distribution
6361
finalize:
6462
- from: /rootfs
6563
to: /

llvm/pkg.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ steps:
3232
patch -p1 < /pkg/patches/fix-memory-mf_exec-on-aarch64.patch
3333
patch -p1 < /pkg/patches/llvm-stack-size.patch
3434
- |
35+
# -DLLVM_ENABLE_PROJECTS="clang,lld" \
36+
# -DLLVM_DISTRIBUTION_COMPONENTS=
3537
cmake -S llvm -B build -G Ninja \
3638
-DCMAKE_BUILD_TYPE=Release \
3739
-DCMAKE_INSTALL_PREFIX=/usr \
38-
-DCMAKE_SKIP_RPATH=ON \
3940
-DLLVM_DEFAULT_TARGET_TRIPLE="${ARCH}-linux-musl" \
4041
-DLLVM_HOST_TRIPLE="${ARCH}-linux-musl" \
4142
-DLLVM_INCLUDE_TESTS=OFF \
@@ -54,7 +55,7 @@ steps:
5455
cmake --build build
5556
install:
5657
- |
57-
DESTDIR=/rootfs cmake --install build
58+
DESTDIR=/rootfs ninja -C build install-distribution
5859
# rm /rootfs/usr/lib/*.a # TODO - remove static libs from the tools image
5960
# optviewer
6061
rm -r /rootfs/usr/share

0 commit comments

Comments
 (0)