diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-03-14 16:58:35 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-03-14 16:58:35 -0400 |
| commit | caa1b329f11d39515e29ad93fb1ff72595fce8d4 (patch) | |
| tree | b16914dfbe293a34acd6a033f2cfc7363e884eff | |
| parent | 4bb98e2b61ce75d7f5d19398b658441a7ceed04b (diff) | |
| download | UXP-caa1b329f11d39515e29ad93fb1ff72595fce8d4.tar UXP-caa1b329f11d39515e29ad93fb1ff72595fce8d4.tar.gz UXP-caa1b329f11d39515e29ad93fb1ff72595fce8d4.tar.lz UXP-caa1b329f11d39515e29ad93fb1ff72595fce8d4.tar.xz UXP-caa1b329f11d39515e29ad93fb1ff72595fce8d4.zip | |
Fix mozbuild looking for .cargo
| -rwxr-xr-x | js/src/make-source-package.sh | 4 | ||||
| -rw-r--r-- | moz.build | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/js/src/make-source-package.sh b/js/src/make-source-package.sh index f4131b98f..6e44dd977 100755 --- a/js/src/make-source-package.sh +++ b/js/src/make-source-package.sh @@ -95,10 +95,6 @@ case $cmd in # copy build and config directory. cp -pPR ${TOPSRCDIR}/build ${TOPSRCDIR}/config ${tgtpath} - # copy cargo config - ${MKDIR} -p ${tgtpath}/.cargo - cp -pPR ${TOPSRCDIR}/.cargo/config.in ${tgtpath}/.cargo - # generate configure files to avoid build dependency on autoconf-2.13 cp -PR ${TOPSRCDIR}/js/src/configure.in ${tgtpath}/js/src/configure chmod a+x ${tgtpath}/js/src/configure @@ -84,6 +84,4 @@ if not CONFIG['JS_STANDALONE'] and CONFIG['MOZ_BUILD_APP']: # Bring in the configuration for the configured application. include('/' + CONFIG['MOZ_BUILD_APP'] + '/app.mozbuild') -CONFIGURE_SUBST_FILES += ['.cargo/config'] - include('build/templates.mozbuild') |