DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-13 15:16:48 +00:00
Code Issues Releases Wiki Activity

解决编译gcc、binutils的脚本中，变量名称错误的问题 (#142)

Browse Source
This commit is contained in:
login 2023-01-08 11:38:59 +08:00 committed by GitHub
parent 62e4613978
commit fd91905f02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/src/lib.rs
View File

@ -38,7 +38,6 @@ use mm::allocator::KernelAllocator;
use crate::{ use crate::{
arch::asm::current::current_pcb, arch::asm::current::current_pcb,
include::bindings::bindings::{process_do_exit, BLACK, GREEN}, include::bindings::bindings::{process_do_exit, BLACK, GREEN},
libs::lockref::LockRef,
}; };
// 声明全局的slab分配器 // 声明全局的slab分配器

6
user/port/binutils/2.38/build.sh
View File

@ -11,8 +11,8 @@ if [ ! -d ${binutils_path} ]; then
exit 1 exit 1
fi fi
if [ ! -d ${sysroot} ]; then if [ ! -d ${sys_root} ]; then
echo "Error: ${sysroot} not found" echo "Error: ${sys_root} not found"
exit 1 exit 1
fi fi
@ -35,7 +35,7 @@ sudo apt-get install -y \
wget wget
cd build-binutils cd build-binutils
${binutils_path}/configure --prefix=${PREFIX} --target=x86_64-dragonos --with-sysroot=${sysroot} --disable-werror || exit 1 ${binutils_path}/configure --prefix=${PREFIX} --target=x86_64-dragonos --with-sysroot=${sys_root} --disable-werror || exit 1
make -j $(nproc) || exit 1 make -j $(nproc) || exit 1
make install || exit 1 make install || exit 1
make clean || exit 1 make clean || exit 1

6
user/port/gcc/11.3.0/build-hosted.sh
View File

@ -17,8 +17,8 @@ if [ ! -d ${gcc_path} ]; then
exit 1 exit 1
fi fi
if [ ! -d ${sysroot} ]; then if [ ! -d ${sys_root} ]; then
echo "Error: ${sysroot} not found" echo "Error: ${sys_root} not found"
exit 1 exit 1
fi fi
@ -40,7 +40,7 @@ mkdir -p build-gcc || exit 1
mkdir -p ${PREFIX} || exit 1 mkdir -p ${PREFIX} || exit 1
cd build-gcc cd build-gcc
${gcc_path}/configure --prefix=${PREFIX} --target=x86_64-dragonos --with-sysroot=${sysroot} --disable-werror --disable-shared --disable-bootstrap --enable-languages=c,c++ || exit 1 ${gcc_path}/configure --prefix=${PREFIX} --target=x86_64-dragonos --with-sysroot=${sys_root} --disable-werror --disable-shared --disable-bootstrap --enable-languages=c,c++ || exit 1
make all-gcc all-target-libgcc -j $(nproc) || exit 1 make all-gcc all-target-libgcc -j $(nproc) || exit 1
make install-gcc install-target-libgcc -j $(nproc) || exit 1 make install-gcc install-target-libgcc -j $(nproc) || exit 1
# 这里会报错，暂时不知道为什么 # 这里会报错，暂时不知道为什么