keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build-sys: Propagate Automake verbose mode to Rust/cargo

Browse Source 
This is analogous to commit c62058e548
which propagated `V=1` into `cmake`.  Except if the build *isn't*
verbose (for local development), let's not force `--verbose` on
for Rust.

Closes: #1583
Approved by: jlebon
This commit is contained in:
Colin Walters 2018-09-26 10:23:48 -04:00 committed by Atomic Bot
parent 8df07a3b1e
commit c96f93f0ad
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile-rpm-ostree.am
View File

@ -84,12 +84,15 @@ if BUILDOPT_NEW_NAME
INSTALL_DATA_HOOKS += install-bin-hook INSTALL_DATA_HOOKS += install-bin-hook
endif endif
# Propagate automake verbose mode
cargo_build = $(cargo) build $(if $(subst 0,,$(V)),--verbose,)
if !HAVE_PREBUILT_CBINDGEN if !HAVE_PREBUILT_CBINDGEN
if !HAVE_EXTERNAL_CBINDGEN if !HAVE_EXTERNAL_CBINDGEN
rpmostree-bindgen: bindgen/Cargo.toml bindgen/src/main.rs rpmostree-bindgen: bindgen/Cargo.toml bindgen/src/main.rs
cd $(top_srcdir)/bindgen && \ cd $(top_srcdir)/bindgen && \
export CARGO_TARGET_DIR=@abs_top_builddir@/bindgen-target && \ export CARGO_TARGET_DIR=@abs_top_builddir@/bindgen-target && \
$(cargo) build --verbose && \ $(cargo_build) && \
ln -sf $${CARGO_TARGET_DIR}/debug/rpmostree-bindgen $(abs_top_builddir)/rpmostree-bindgen ln -sf $${CARGO_TARGET_DIR}/debug/rpmostree-bindgen $(abs_top_builddir)/rpmostree-bindgen
endif endif
endif endif
@ -105,7 +108,7 @@ $(librpmostree_rust_path): Makefile $(LIBRPMOSTREE_RUST_SRCS)
export CARGO_TARGET_DIR=@abs_top_builddir@/target && \ export CARGO_TARGET_DIR=@abs_top_builddir@/target && \
target_subdir=@abs_top_builddir@/target/@RUST_TARGET_SUBDIR@; \ target_subdir=@abs_top_builddir@/target/@RUST_TARGET_SUBDIR@; \
if test -d "{target_subdir}" && [ "$(stat -c '%u' ${target_subdir})" != "$(id -u)" ]; then frozen=--frozen; fi && \ if test -d "{target_subdir}" && [ "$(stat -c '%u' ${target_subdir})" != "$(id -u)" ]; then frozen=--frozen; fi && \
$(cargo) build --verbose $${frozen} $(CARGO_RELEASE_ARGS) $(cargo_build) $${frozen} $(CARGO_RELEASE_ARGS)
EXTRA_DIST += $(LIBRPMOSTREE_RUST_SRCS) rust/Cargo.lock EXTRA_DIST += $(LIBRPMOSTREE_RUST_SRCS) rust/Cargo.lock
# Generate bindings from Rust to C # Generate bindings from Rust to C