summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-03-15 09:11:46 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-03-15 09:11:46 +0100
commit0d3ee51ad2d61bffba14232b2df913d3a773d771 (patch)
tree3322c6faeca2f6bf657f7e8f1623bc7894f6d18f
parent82b361dc4463b13ebda30090e239db487f5aa308 (diff)
parentcaa1b329f11d39515e29ad93fb1ff72595fce8d4 (diff)
downloadUXP-0d3ee51ad2d61bffba14232b2df913d3a773d771.tar
UXP-0d3ee51ad2d61bffba14232b2df913d3a773d771.tar.gz
UXP-0d3ee51ad2d61bffba14232b2df913d3a773d771.tar.lz
UXP-0d3ee51ad2d61bffba14232b2df913d3a773d771.tar.xz
UXP-0d3ee51ad2d61bffba14232b2df913d3a773d771.zip
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
-rwxr-xr-xjs/src/make-source-package.sh4
-rw-r--r--moz.build2
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
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')