mirror of
https://github.com/openwrt/packages.git
synced 2025-12-23 05:54:33 +04:00
edc323ba63
In order to use $(RUSTC_TARGET_ARCH) in HOST_BUILD_DIR, the line to include rust-values.mk in the Rust makefile was moved inf489e019ac, causing it to be included before package.mk is included. This had the side effect of preventing "-lssp_nonshared" from being added to RUSTC_LDFLAGS, because PKG_SSP is indirectly set by package.mk (package.mk includes hardening.mk, hardening.mk sets PKG_SSP). There is a deeper issue; it is the Rust package's PKG_SSP value that causes RUSTC_LDFLAGS to be set and written to the Cargo config file. For packages that use Rust to build, their PKG_SSP value does not affect the linker flag. This sets rustflags with the RUSTFLAGS environment variable, instead of writing the value to the Cargo config file, allowing PKG_SSP from the package being built to be used and for the package being built to modify the rustflags used. This also: * Fix "-lssp_nonshared" being added to TARGET_CFLAGS instead of RUSTC_LDFLAGS, when CONFIG_PKG_CC_STACKPROTECTOR_STRONG is set. * Remove the use of $(RUSTC_TARGET_ARCH) in HOST_BUILD_DIR and move the include line for rust-values.mk back to after package.mk. Since the host build directory was moved under the target build directory inefdbac38dc, it is no longer necessary to separate build directories with RUSTC_TARGET_ARCH; $(BUILD_DIR) already separates build directories by target. * Add BUILDONLY:=1, as the Rust package does not build a target package. * Install the Cargo config file as "config.toml" instead of "config", as this is the preferred form[1]. * Rename RUST_CFLAGS to RUSTC_CFLAGS and CONFIG_HOST_SUFFIX to RUSTC_HOST_SUFFIX, for consistency. * Allow CARGO_VARS to be set before rust-values.mk is included. [1]: https://doc.rust-lang.org/cargo/reference/config.html#hierarchical-structure Fixes:f489e019ac("rust: compile host package per target") Fixes:83785a7ce0("rust-lang: Add the rust language support") Fixes: https://github.com/openwrt/packages/issues/22133 Signed-off-by: Jeffery To <jeffery.to@gmail.com> (cherry picked from commit37762abcb4)
50 lines
1.3 KiB
Makefile
50 lines
1.3 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0-only
|
|
#
|
|
# Copyright (C) 2023 Luca Barbato and Donald Hoskins
|
|
|
|
# Variables (all optional) to be set in package Makefiles:
|
|
#
|
|
# RUST_PKG_FEATURES - list of options, default empty
|
|
#
|
|
# Space or comma separated list of features to activate
|
|
#
|
|
# e.g. RUST_PKG_FEATURES:=enable-foo,with-bar
|
|
|
|
ifeq ($(origin RUST_INCLUDE_DIR),undefined)
|
|
RUST_INCLUDE_DIR:=$(dir $(lastword $(MAKEFILE_LIST)))
|
|
endif
|
|
include $(RUST_INCLUDE_DIR)/rust-values.mk
|
|
|
|
# $(1) path to the package (optional)
|
|
# $(2) additional arguments to cargo (optional)
|
|
define Build/Compile/Cargo
|
|
( \
|
|
cd $(PKG_BUILD_DIR) ; \
|
|
export PATH="$(CARGO_HOME)/bin:$(PATH)" ; \
|
|
CARGO_HOME=$(CARGO_HOME) \
|
|
TARGET_CFLAGS="$(TARGET_CFLAGS) $(RUSTC_CFLAGS)" \
|
|
TARGET_CC=$(TARGET_CC_NOCACHE) \
|
|
CC=$(HOSTCC_NOCACHE) \
|
|
RUSTFLAGS="$(CARGO_RUSTFLAGS)" \
|
|
$(CARGO_VARS) \
|
|
cargo install -v \
|
|
--profile stripped \
|
|
--target $(RUSTC_TARGET_ARCH) \
|
|
$(if $(strip $(RUST_PKG_FEATURES)),--features "$(strip $(RUST_PKG_FEATURES))") \
|
|
--root $(PKG_INSTALL_DIR) \
|
|
--path "$(if $(strip $(1)),$(strip $(1)),.)" \
|
|
$(2) ; \
|
|
)
|
|
endef
|
|
|
|
define RustBinPackage
|
|
ifndef Package/$(1)/install
|
|
define Package/$(1)/install
|
|
$$(INSTALL_DIR) $$(1)/usr/bin/
|
|
$$(INSTALL_BIN) $$(PKG_INSTALL_DIR)/bin/* $$(1)/usr/bin/
|
|
endef
|
|
endif
|
|
endef
|
|
|
|
Build/Compile=$(call Build/Compile/Cargo)
|