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

build-sys: Avoid re-building + re-linking cxx-rs C++ bits each build

Browse Source 
We need to do the same `cmp` dance for the generated `.cxx` file
as for the source, because `make` only works on timestamps.

Currently every time one edits the rust code and types `make`
we end up re-building that object, which also forces a re-link
of the `librpmostreeinternals.la` library.
This commit is contained in:
Colin Walters 2021-04-16 10:54:04 -04:00
parent b2b3795df1
commit 2ed1e73c06
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.bindings
View File

@ -14,7 +14,13 @@ rpmostree-cxxrs.h: $(binding_rust_sources)
echo cxxbridge failed; exit 1; \ echo cxxbridge failed; exit 1; \
fi fi
rpmostree-cxxrs.cxx: $(binding_rust_sources) rpmostree-cxxrs.h rpmostree-cxxrs.cxx: $(binding_rust_sources) rpmostree-cxxrs.h
$(AM_V_GEN) cxxbridge --include rpmostree-cxxrs.h rust/src/lib.rs > $@ $(AM_V_GEN) if cxxbridge --include rpmostree-cxxrs.h rust/src/lib.rs > $@.tmp; then \
if test -f $@ && cmp $@.tmp $@ 2>/dev/null; then rm -f $@.tmp; else \
mv $@.tmp $@; \
fi; \
else \
echo cxxbridge failed; exit 1; \
fi
# Invoked in CI # Invoked in CI
bindings: rpmostree-cxxrs.h rpmostree-cxxrs.cxx rust/cxx.h bindings: rpmostree-cxxrs.h rpmostree-cxxrs.cxx rust/cxx.h