Skip to content

Commit

Permalink
Alternate fix for rust build args
Browse files Browse the repository at this point in the history
  • Loading branch information
mreid-tt committed Nov 28, 2023
1 parent 4d86ff5 commit 05adf10
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
4 changes: 3 additions & 1 deletion cross/syncstorage-rs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ LICENSE = https://github.com/mozilla-services/syncstorage-rs/blob/master/LICENS

# arguments to install the main server program
RUST_SRC_DIR = $(WORK_DIR)/$(PKG_DIR)/syncserver
ENV += RUSTFLAGS="--no-default-features --features=syncstorage-db/mysql --locked"
CARGO_BUILD_ARGS += --no-default-features
CARGO_BUILD_ARGS += --features=syncstorage-db/mysql
CARGO_BUILD_ARGS += --locked

include ../../mk/spksrc.cross-rust.mk
6 changes: 5 additions & 1 deletion mk/spksrc.cross-rust.mk
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,14 @@ endif
CARGO_INSTALL_ARGS += --path $(RUST_SRC_DIR)
CARGO_INSTALL_ARGS += --root $(STAGING_INSTALL_PREFIX)

ifeq ($(strip $(CARGO_BUILD_ARGS)),)
CARGO_BUILD_ARGS =
endif

# Default build with rust and install with cargo
rust_install_target:
@echo " ==> Cargo install rust package $(PKG_NAME) ($(shell rustc --version); $(RUST_TOOLCHAIN))"
@$(RUN) cargo +$(RUST_TOOLCHAIN) install $(CARGO_INSTALL_ARGS)
@$(RUN) cargo +$(RUST_TOOLCHAIN) install $(CARGO_INSTALL_ARGS) $(CARGO_BUILD_ARGS)


#####
Expand Down

0 comments on commit 05adf10

Please sign in to comment.