зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1490948: Adjustments for the source package; r=chmanchester
- Embed vendored Rust dependencies into the source package. - Don't use --freeze with Cargo in JS standalone builds: since all the Rust dependencies are vendored in, it won't trigger an update of the toplevel Cargo.lock file for a standalone build in the non-package build case. --HG-- extra : rebase_source : 06704eb326aad36a870586694a99964ad7a4dbfa extra : histedit_source : 1502d976bc12a3eed17efaaf5dd2d4f46d0b00d5
This commit is contained in:
Родитель
5dc668ca50
Коммит
5523ac828b
|
@ -842,7 +842,14 @@ cargo_build_flags = $(CARGOFLAGS)
|
|||
ifndef MOZ_DEBUG_RUST
|
||||
cargo_build_flags += --release
|
||||
endif
|
||||
|
||||
# The Spidermonkey library can be built from a package tarball outside the
|
||||
# tree, so we want to let Cargo create lock files in this case. When built
|
||||
# within a tree, the Rust dependencies have been vendored in so Cargo won't
|
||||
# touch the lock file.
|
||||
ifndef JS_STANDALONE
|
||||
cargo_build_flags += --frozen
|
||||
endif
|
||||
|
||||
cargo_build_flags += --manifest-path $(CARGO_FILE)
|
||||
ifdef BUILD_VERBOSE_LOG
|
||||
|
|
|
@ -123,6 +123,9 @@ case $cmd in
|
|||
cp -pPR \
|
||||
${TOPSRCDIR}/third_party/python \
|
||||
${tgtpath}/third_party
|
||||
cp -pPR \
|
||||
${TOPSRCDIR}/third_party/rust \
|
||||
${tgtpath}/third_party
|
||||
${MKDIR} -p ${tgtpath}/dom/bindings
|
||||
cp -pPR \
|
||||
${TOPSRCDIR}/dom/bindings/mozwebidlcodegen \
|
||||
|
|
Загрузка…
Ссылка в новой задаче