diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-05-05 12:28:36 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-05-05 12:28:36 +0000 |
| commit | e41bdc85df87fec3dbdce52568d217ae0d58127c (patch) | |
| tree | e246d56f61bd1c1520cd0ad3b132442d44c48dad /coreconf/ruleset.mk | |
| parent | 34cad02bea04fbfcbe57f4513426af1eaa4862b5 (diff) | |
| download | nss-hg-e41bdc85df87fec3dbdce52568d217ae0d58127c.tar.gz | |
Bug 290526 Don't delete directories r=rrelyea
If these files exist and aren't directories, there might be other
problems. Trying to "fix" them by removing will break the build.
Differential Revision: https://phabricator.services.mozilla.com/D69018
Diffstat (limited to 'coreconf/ruleset.mk')
| -rw-r--r-- | coreconf/ruleset.mk | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/coreconf/ruleset.mk b/coreconf/ruleset.mk index 74d64e1fb..e9646eecf 100644 --- a/coreconf/ruleset.mk +++ b/coreconf/ruleset.mk @@ -133,13 +133,10 @@ ifndef BUILT_SRCS $(BUILT_CSRCS) $(BUILT_CPPSRCS) $(BUILT_ASFILES)) endif - -ifeq (,$(filter-out WIN%,$(OS_TARGET))) - MAKE_OBJDIR = $(INSTALL) -D $(OBJDIR) -else - define MAKE_OBJDIR - if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); fi - endef +ifndef MAKE_OBJDIR +define MAKE_OBJDIR +if test ! -d $(@D); then $(NSINSTALL) -D $(@D); fi +endef endif ifndef PACKAGE |