Browse Source

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

login 2 years ago
parent
commit
fd91905f02
3 changed files with 6 additions and 7 deletions
  1. 0 1
      kernel/src/lib.rs
  2. 3 3
      user/port/binutils/2.38/build.sh
  3. 3 3
      user/port/gcc/11.3.0/build-hosted.sh

+ 0 - 1
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分配器

+ 3 - 3
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

+ 3 - 3
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
 # 这里会报错,暂时不知道为什么