Skip to content

Commit 3e59a11

Browse files
author
MochiOS Team
committed
install clang + set CC_FOR_TARGET for mochiboot efi build
1 parent 8dc89f9 commit 3e59a11

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎.github/workflows/build-iso.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: install deps
1919
run: |
2020
pacman -Syu --noconfirm
21-
pacman -S --noconfirm archiso base-devel go git sudo fakeroot
21+
pacman -S --noconfirm archiso base-devel go git sudo fakeroot clang
2222
2323
- name: setup build user
2424
run: |

‎.github/workflows/repo.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
run: |
3333
pacman-key --init
3434
pacman-key --populate archlinux
35-
pacman -Sy --noconfirm base-devel go python python-textual zstd git fakeroot nasm autoconf automake mtools
35+
pacman -Sy --noconfirm base-devel go python python-textual zstd git fakeroot nasm autoconf automake mtools clang
3636
3737
- name: Create builder
3838
run: |
@@ -70,7 +70,7 @@ jobs:
7070
cd pkgbuilds/mochiboot
7171
pkgver=$(grep -oP '^pkgver=\K.*' PKGBUILD | head -1)
7272
tar czf "mochiboot-$pkgver.tar.gz" --exclude="mochiboot-$pkgver.tar.gz" --exclude='pkg' --exclude='src' *
73-
sudo -u builder makepkg -cf --noconfirm --nodeps
73+
CC_FOR_TARGET=gcc sudo -u builder makepkg -cf --noconfirm --nodeps
7474
7575
- name: Create repo
7676
run: |

‎build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ echo "==> rebuilding mochiboot pkg..."
5555
cd "$MOCHIOS_DIR/pkgbuilds/mochiboot"
5656
pkgver=$(_get_pkgver PKGBUILD)
5757
tar czf "mochiboot-$pkgver.tar.gz" --exclude="mochiboot-$pkgver.tar.gz" --exclude='pkg' --exclude='src' *
58-
sudo -u mochi makepkg -cf --noconfirm --nodeps
58+
CC_FOR_TARGET=gcc sudo -u mochi makepkg -cf --noconfirm --nodeps
5959
cp "$MOCHIOS_DIR/pkgbuilds/mochiboot"/mochiboot-[0-9]*.pkg.tar.zst "$REPO_DIR/os/x86_64/"
6060

6161
echo "==> rebuilding mochios-defaults pkg..."

‎pkgbuilds/mochiboot/PKGBUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ sha256sums=('SKIP'
2525
build() {
2626
cd "$srcdir/mochiboot"
2727
./bootstrap
28-
./configure --enable-grub --enable-bios --enable-uefi-x86-64
28+
CC_FOR_TARGET="${CC_FOR_TARGET:-gcc}" ./configure --enable-grub --enable-bios --enable-uefi-x86-64
2929
make
3030
}
3131

0 commit comments

Comments
 (0)