summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-03-31 09:44:18 -0400
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-14 13:21:33 +0200
commit02519e85757e3c7bfedfe2534f826b9ab1e742d7 (patch)
tree39da9d9ad01776371730f95f99920626c94b4de8
parente003547dc5c0f9336d95e499e0cefbd320130763 (diff)
downloadUXP-02519e85757e3c7bfedfe2534f826b9ab1e742d7.tar
UXP-02519e85757e3c7bfedfe2534f826b9ab1e742d7.tar.gz
UXP-02519e85757e3c7bfedfe2534f826b9ab1e742d7.tar.lz
UXP-02519e85757e3c7bfedfe2534f826b9ab1e742d7.tar.xz
UXP-02519e85757e3c7bfedfe2534f826b9ab1e742d7.zip
Explicitly remove dist/bin before mozbuild's install_manifests get a hold of it
-rw-r--r--Makefile.in6
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in
index 26cd688d4..ed00909cb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,6 +47,12 @@ ifndef MOZ_PROFILE_USE
# We need to explicitly put BUILD_BACKEND_FILES here otherwise the rule in
# rules.mk doesn't run early enough.
$(TIERS) binaries:: CLOBBER $(configure_dir)/configure config.status $(BUILD_BACKEND_FILES)
+
+# While our mozbuild backend has some kind of crazy install_manfests junk to
+# try and make this not have to happen, we actually want dist/bin to be
+# completely removed regardless.
+default alldep all::
+ $(RM) -r $(DIST)/bin
ifndef JS_STANDALONE
ifdef COMPILE_ENVIRONMENT
$(TIERS) binaries:: $(topsrcdir)/js/src/configure js/src/config.status