From b0b790fab82526264466ff923a097dfc74390e86 Mon Sep 17 00:00:00 2001 From: pointer-to-bios Date: Fri, 5 Apr 2024 22:58:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9Brustlib=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rustlib | 2 +- src/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rustlib b/rustlib index 603b446..6a2ca2a 160000 --- a/rustlib +++ b/rustlib @@ -1 +1 @@ -Subproject commit 603b446b09569e22e6b939bf173a518c0955d687 +Subproject commit 6a2ca2afcd651e46f1c19f8d8a3f685fd982d824 diff --git a/src/Makefile b/src/Makefile index 94ca7a6..24a0b66 100644 --- a/src/Makefile +++ b/src/Makefile @@ -30,7 +30,7 @@ endif RSCFLAGS = --emit obj --crate-type staticlib --verbose \ --crate-name=metaverse \ --edition 2021 \ - -L crate="${PWD}/../rustlib/${ARCH}/src/" \ + -L crate="${PWD}/../rustlib/src/" \ -C code-model=large \ -C relocation-model=static \ -C embed-bitcode=no @@ -47,7 +47,7 @@ ifeq (${ARCH},x86_64) RSCFLAGS := ${RSCFLAGS} -C target-feature=-sse endif -RUSTLIB_PATH = ../rustlib/${ARCH}/lib +RUSTLIB_PATH = ../rustlib/${ARCH} RUST_LIBS = "${RUSTLIB_PATH}/liballoc.rlib" "${RUSTLIB_PATH}/libcompiler_builtins.rlib" \ "${RUSTLIB_PATH}/libcore.rlib" "${RUSTLIB_PATH}/librustc_std_workspace_core.rlib"