mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-25 05:41:12 +00:00
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 : e8c0268a2a6e91ca2000b340beee2dcff0636591
This commit is contained in:
parent
24f3ed4b74
commit
d9f364de3f
@ -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'
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user