bug 1401647 - Fix spidermonkey mozjs / rust-bindings builds. r=nalexander

The spidermonkey mozjs and rust-bindings builds run sed on
$topsrcdir/.cargo/config.in to generate the cargo config they use, but
they previously only replaced the @top_srcdir@ substitution. This patch
makes them replace any other substitutions with an empty value to add
a bit of future-proofing.

MozReview-Commit-ID: 1DzP9vXxHMD

--HG--
extra : rebase_source : e2d86922b3ef78df0a0774ef1326f4fd979de371
This commit is contained in:
Ted Mielczarek 2018-01-03 14:51:52 -05:00
parent ad688de73b
commit 162a6803fa
3 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
# Note: if you add more configure substitutions here with required values
# you will also need to fix the sed commands in:
# taskcluster/scripts/builder/build-sm-mozjs-crate.sh
# taskcluster/scripts/builder/build-sm-rust-bindings.sh
[source.crates-io]
registry = 'https://github.com/rust-lang/crates.io-index'
replace-with = 'vendored-sources'

View File

@ -7,7 +7,7 @@ source $(dirname $0)/sm-tooltool-config.sh
# Ensure that we have a .config/cargo that points us to our vendored crates
# rather than to crates.io.
cd "$SRCDIR/.cargo"
sed -e "s|@top_srcdir@|$SRCDIR|" < config.in | tee config
sed -e "s|@top_srcdir@|$SRCDIR|" -e 's|@[^@]*@||g' < config.in > config
cd "$SRCDIR/js/src"

View File

@ -7,7 +7,7 @@ source $(dirname $0)/sm-tooltool-config.sh
# Ensure that we have a .config/cargo that points us to our vendored crates
# rather than to crates.io.
cd "$SRCDIR/.cargo"
sed -e "s|@top_srcdir@|$SRCDIR|" < config.in | tee config
sed -e "s|@top_srcdir@|$SRCDIR|" -e 's|@[^@]*@||g' < config.in > config
cd "$SRCDIR/js/rust"