mirror of
https://github.com/DragonOS-Community/DragonOS.git
synced 2025-06-26 06:53:23 +00:00
Patch gcc toolchain (#111)
* 添加了GCC_cross_compile——tool_chain * - 解决环境变量路径拼接时,多了`/`的问题 - apt安装时增加-y,不需用户确认 * 解决添加环境变量的命令有误的问题 * 修正编译错误时,还会执行下一步的问题 * new: 编译完成后清理临时文件 * 更新makefile * 调整:把grub安装在 $HOME/opt/dragonos-grub下 * new: 新增dockerfile * 将镜像源换成中科大的(原因是清华的总是ban掉用于构建镜像的服务器的ip) * 修改为基于debian bullseye构建 * 取消指定版本 * 修复MBR磁盘镜像未设置启动标志的bug * 取消在docker中安装grub * 安装grub的过程改到客户机上进行 * bootstrap.sh 添加--no-docker * 使用新版的docker编译镜像 * 修补, 添加了一些关于gcc的check Co-authored-by: longjin <longjin@RinGoTek.cn>
This commit is contained in:
19
Makefile
19
Makefile
@ -28,9 +28,18 @@ ifeq ($(DEBUG), DEBUG)
|
||||
GLOBAL_CFLAGS += -g
|
||||
endif
|
||||
|
||||
export CC=gcc
|
||||
# ifeq ($(DragonOS_GCC), )
|
||||
# $(error 尚未安装DragonOS交叉编译器, 请使用tools文件夹下的build_gcc_toolchain.sh脚本安装)
|
||||
# endif
|
||||
|
||||
.PHONY: all
|
||||
export CC=$(DragonOS_GCC)/x86_64-elf-gcc
|
||||
export LD=ld
|
||||
export AS=$(DragonOS_GCC)/x86_64-elf-as
|
||||
export NM=$(DragonOS_GCC)/x86_64-elf-nm
|
||||
export OBJCOPY=$(DragonOS_GCC)/x86_64-elf-objcopy
|
||||
|
||||
|
||||
.PHONY: all
|
||||
all: kernel user
|
||||
|
||||
|
||||
@ -64,11 +73,11 @@ gdb:
|
||||
|
||||
# 写入磁盘镜像
|
||||
write_diskimage:
|
||||
sudo sh -c "cd tools && bash grub_auto_install.sh && bash $(ROOT_PATH)/tools/write_disk_image.sh --bios=legacy && cd .."
|
||||
bash -c "cd tools && bash grub_auto_install.sh && sudo bash $(ROOT_PATH)/tools/write_disk_image.sh --bios=legacy && cd .."
|
||||
|
||||
# 写入磁盘镜像(uefi)
|
||||
write_diskimage-uefi:
|
||||
sudo sh -c "cd tools && bash grub_auto_install.sh && bash $(ROOT_PATH)/tools/write_disk_image.sh --bios=uefi && cd .."
|
||||
bash -c "cd tools && bash grub_auto_install.sh && sudo bash $(ROOT_PATH)/tools/write_disk_image.sh --bios=uefi && cd .."
|
||||
# 不编译,直接启动QEMU
|
||||
qemu:
|
||||
sh -c "cd tools && bash run-qemu.sh --bios=legacy && cd .."
|
||||
@ -85,6 +94,7 @@ build:
|
||||
docker:
|
||||
@echo "使用docker构建"
|
||||
sudo bash tools/build_in_docker.sh || exit 1
|
||||
$(MAKE) write_diskimage || exit 1
|
||||
|
||||
# uefi方式启动
|
||||
run-uefi:
|
||||
@ -102,4 +112,5 @@ run:
|
||||
run-docker:
|
||||
@echo "使用docker构建并运行"
|
||||
sudo bash tools/build_in_docker.sh || exit 1
|
||||
$(MAKE) write_diskimage || exit 1
|
||||
$(MAKE) qemu
|
||||
|
Reference in New Issue
Block a user