Skip to content

feat(build): Support x86_64-pc-linux-gnu prefix and GCC15 in scripts #2126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
donjuanplatinum wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(build): Support x86_64-pc-linux-gnu prefix and GCC15 in scripts #2126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions kernel/env.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,19 @@ include ../env.mk
ifeq ($(USING_DRAGONOS_NIX_ENV),1) # Nix toolchain doesn't need to specify the prefix
CCPREFIX=
else ifeq ($(ARCH), x86_64)
# Some distro like Gentoo use x86_64-pc-linux-gnu prefix
ifneq ($(wildcard /usr/bin/x86_64-pc-linux-gnu-gcc),)
CCPREFIX=x86_64-pc-linux-gnu-
else
CCPREFIX=x86_64-linux-gnu-
endif
else ifeq ($(ARCH), riscv64)
# Some distro like Gentoo use riscv64-pc-linux-gnu prefix
ifneq ($(wildcard /usr/bin/riscv64-pc-linux-gnu-gcc),)
CCPREFIX=riscv64-pc-linux-gnu-
else
CCPREFIX=riscv64-linux-gnu-
endif
else ifeq ($(ARCH), loongarch64)
CCPREFIX=loongarch64-unknown-linux-gnu-
else
Expand Down
4 changes: 3 additions & 1 deletion tools/grub_auto_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ export LD=ld
export AS=as
export NM=nm
export OBJCOPY=objcopy
# GCC 15 默认 C23，C23 将 bool/true/false 作为关键字，GRUB 2.06 不兼容，强制用 gnu11
export CFLAGS="-std=gnu11"


#检测grub是否已经安装
Expand All @@ -55,7 +57,7 @@ install_options=("install -y" \
"-S --needed --noconfirm" \
"install -y" \
"install -y" \
""
"-v"
)
found_pm=0
pm_index=0
Expand Down
Loading