diff --git a/Makefile b/Makefile index cc3b575..d243c06 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,6 @@ # The toolchain we use. # You can get it by running DragonOS' `tools/bootstrap.sh` TOOLCHAIN="+nightly-2023-08-15-x86_64-unknown-linux-gnu" -RUSTFLAGS+="-C target-feature=+crt-static -C link-arg=-no-pie" ifdef DADK_CURRENT_BUILD_DIR # 如果是在dadk中编译,那么安装到dadk的安装目录中 @@ -22,29 +21,29 @@ else endif build: - RUSTFLAGS=$(RUSTFLAGS) cargo $(TOOLCHAIN) build --target $(RUST_TARGET) + cargo $(TOOLCHAIN) build --target $(RUST_TARGET) run-dragonreach: - RUSTFLAGS=$(RUSTFLAGS) cargo $(TOOLCHAIN) run --target $(RUST_TARGET) --bin DragonReach + cargo $(TOOLCHAIN) run --target $(RUST_TARGET) --bin DragonReach clean: - RUSTFLAGS=$(RUSTFLAGS) cargo $(TOOLCHAIN) clean + cargo $(TOOLCHAIN) clean build-release: - RUSTFLAGS=$(RUSTFLAGS) cargo $(TOOLCHAIN) build --target $(RUST_TARGET) --release + cargo $(TOOLCHAIN) build --target $(RUST_TARGET) --release clean-release: - RUSTFLAGS=$(RUSTFLAGS) cargo $(TOOLCHAIN) clean --target $(RUST_TARGET) --release + cargo $(TOOLCHAIN) clean --target $(RUST_TARGET) --release fmt: - RUSTFLAGS=$(RUSTFLAGS) cargo $(TOOLCHAIN) fmt + cargo $(TOOLCHAIN) fmt fmt-check: - RUSTFLAGS=$(RUSTFLAGS) cargo $(TOOLCHAIN) fmt --check + cargo $(TOOLCHAIN) fmt --check .PHONY: install install: mkdir -p $(INSTALL_DIR)/etc/reach/system mkdir -p $(INSTALL_DIR)/etc/reach/ipc cp ./parse_test/shell.service $(INSTALL_DIR)/etc/reach/system/shell.service - RUSTFLAGS=$(RUSTFLAGS) cargo $(TOOLCHAIN) install --target $(RUST_TARGET) --path . --no-track --root $(INSTALL_DIR) --force \ No newline at end of file + cargo $(TOOLCHAIN) install --target $(RUST_TARGET) --path . --no-track --root $(INSTALL_DIR) --force \ No newline at end of file