diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 67513d1800..8f99f4144b 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -97,10 +97,6 @@ define Host/Install done ; \ find . -mindepth 2 -maxdepth 2 -type f -name install.sh \ -execdir bash '{}' --prefix=$(STAGING_DIR)/host --disable-ldconfig \; ; \ - \ - sed -e 's|@RUSTC_TARGET_ARCH@|$(RUSTC_TARGET_ARCH)|g' \ - -e 's|@TARGET_CC_NOCACHE@|$(TARGET_CC_NOCACHE)|g' \ - $(CURDIR)/files/cargo-config > $(CARGO_HOME)/config.toml ; \ ) endef diff --git a/lang/rust/files/cargo-config b/lang/rust/files/cargo-config deleted file mode 100644 index 2f490dc580..0000000000 --- a/lang/rust/files/cargo-config +++ /dev/null @@ -1,7 +0,0 @@ -[target.@RUSTC_TARGET_ARCH@] -linker = "@TARGET_CC_NOCACHE@" - -[profile.stripped] -inherits = "release" -opt-level = "s" -strip = true diff --git a/lang/rust/rust-host-build.mk b/lang/rust/rust-host-build.mk index 29ecc42a5e..a03df2493a 100644 --- a/lang/rust/rust-host-build.mk +++ b/lang/rust/rust-host-build.mk @@ -23,7 +23,7 @@ define Host/Compile/Cargo CARGO_HOME=$(CARGO_HOME) \ CC=$(HOSTCC_NOCACHE) \ cargo install -v \ - --profile stripped \ + --profile $(CARGO_HOST_PROFILE) \ $(if $(RUST_HOST_FEATURES),--features "$(RUST_HOST_FEATURES)") \ --root $(HOST_INSTALL_DIR) \ --path "$(if $(strip $(1)),$(strip $(1)),.)" $(2) ; \ diff --git a/lang/rust/rust-package.mk b/lang/rust/rust-package.mk index 231828bab6..713d37d5be 100644 --- a/lang/rust/rust-package.mk +++ b/lang/rust/rust-package.mk @@ -21,13 +21,15 @@ define Build/Compile/Cargo ( \ cd $(PKG_BUILD_DIR) ; \ CARGO_HOME=$(CARGO_HOME) \ + CARGO_PROFILE_RELEASE_OPT_LEVEL=s \ + CARGO_TARGET_$(subst -,_,$(call toupper,$(RUSTC_TARGET_ARCH)))_LINKER=$(TARGET_CC_NOCACHE) \ TARGET_CFLAGS="$(TARGET_CFLAGS) $(RUSTC_CFLAGS)" \ TARGET_CC=$(TARGET_CC_NOCACHE) \ CC=$(HOSTCC_NOCACHE) \ RUSTFLAGS="$(CARGO_RUSTFLAGS)" \ $(CARGO_VARS) \ cargo install -v \ - --profile stripped \ + --profile $(CARGO_PKG_PROFILE) \ --target $(RUSTC_TARGET_ARCH) \ $(if $(strip $(RUST_PKG_FEATURES)),--features "$(strip $(RUST_PKG_FEATURES))") \ --root $(PKG_INSTALL_DIR) \ diff --git a/lang/rust/rust-values.mk b/lang/rust/rust-values.mk index dfd417340a..02a68d48f1 100644 --- a/lang/rust/rust-values.mk +++ b/lang/rust/rust-values.mk @@ -62,3 +62,7 @@ endif # Support only a subset for now. RUST_ARCH_DEPENDS:=@(aarch64||arm||i386||i686||mips||mipsel||mips64||mips64el||mipsel||powerpc64||riscv64||x86_64) + +CARGO_HOST_PROFILE:=release + +CARGO_PKG_PROFILE:=$(if $(CONFIG_DEBUG),dev,release)