Skip to content

Commit

Permalink
Bug 1618280 - make make distclean work again; r=dmajor
Browse files Browse the repository at this point in the history
We were using `config.status*` as a catchall in `DIST_GARBAGE` for
`config.status` and `config.statusd`.  Unfortunately, the latter was a
directory, so `rm config.status*` error'd out.  We can fix this easily
by putting `config.statusd` in `GARBAGE_DIRS`, which will use `rm -r`,
as intended.

Differential Revision: https://phabricator.services.mozilla.com/D64422

--HG--
extra : moz-landing-system : lando
  • Loading branch information
froydnj committed Feb 26, 2020
1 parent 23dad0d commit 179cc1a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ GARBAGE_DIRS += _javagen _profile staticlib
# subdirectories to remove. So we add to GARBAGE_DIRS once here, globally,
# for it to have the desired effect.
GARBAGE_DIRS += $(RUST_TARGET)
DIST_GARBAGE = config.cache config.log config.status* config-defs.h \
GARBAGE_DIRS += config.statusd
DIST_GARBAGE = config.cache config.log config.status config-defs.h \
config/autoconf.mk \
mozilla-config.h \
netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \
Expand Down
3 changes: 2 additions & 1 deletion js/src/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ ifndef HAVE_DTRACE
endif
endif

DIST_GARBAGE = config.cache config.log config.status* \
GARBAGE_DIRS += config.statusd
DIST_GARBAGE = config.cache config.log config.status \
config/autoconf.mk config/emptyvars.mk \
js-config.h js-confdefs.h \
backend.mk config/backend.mk devtools/backend.mk editline/backend.mk \
Expand Down

0 comments on commit 179cc1a

Please sign in to comment.