diff --git a/kernel/src/lib.rs b/kernel/src/lib.rs index 115ae450..99e6af1b 100644 --- a/kernel/src/lib.rs +++ b/kernel/src/lib.rs @@ -38,7 +38,6 @@ use mm::allocator::KernelAllocator; use crate::{ arch::asm::current::current_pcb, include::bindings::bindings::{process_do_exit, BLACK, GREEN}, - libs::lockref::LockRef, }; // 声明全局的slab分配器 diff --git a/user/port/binutils/2.38/build.sh b/user/port/binutils/2.38/build.sh index 39b9a6ff..0e3e5224 100644 --- a/user/port/binutils/2.38/build.sh +++ b/user/port/binutils/2.38/build.sh @@ -11,8 +11,8 @@ if [ ! -d ${binutils_path} ]; then exit 1 fi -if [ ! -d ${sysroot} ]; then - echo "Error: ${sysroot} not found" +if [ ! -d ${sys_root} ]; then + echo "Error: ${sys_root} not found" exit 1 fi @@ -35,7 +35,7 @@ sudo apt-get install -y \ wget 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 install || exit 1 make clean || exit 1 diff --git a/user/port/gcc/11.3.0/build-hosted.sh b/user/port/gcc/11.3.0/build-hosted.sh index 2b35c92d..bcb4ca91 100644 --- a/user/port/gcc/11.3.0/build-hosted.sh +++ b/user/port/gcc/11.3.0/build-hosted.sh @@ -17,8 +17,8 @@ if [ ! -d ${gcc_path} ]; then exit 1 fi -if [ ! -d ${sysroot} ]; then - echo "Error: ${sysroot} not found" +if [ ! -d ${sys_root} ]; then + echo "Error: ${sys_root} not found" exit 1 fi @@ -40,7 +40,7 @@ mkdir -p build-gcc || exit 1 mkdir -p ${PREFIX} || exit 1 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 install-gcc install-target-libgcc -j $(nproc) || exit 1 # 这里会报错,暂时不知道为什么