From caa1b329f11d39515e29ad93fb1ff72595fce8d4 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Wed, 14 Mar 2018 16:58:35 -0400 Subject: Fix mozbuild looking for .cargo --- js/src/make-source-package.sh | 4 ---- moz.build | 2 -- 2 files changed, 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 diff --git a/moz.build b/moz.build index fee89428d..2c02ec3a0 100644 --- a/moz.build +++ b/moz.build @@ -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') -- cgit v1.2.3