diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-05-08 22:04:11 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-05-08 22:04:11 +0000 |
| commit | 7e759ba8417509336128e6eccd912df5b365f609 (patch) | |
| tree | e1fdceed0cb04ede7ab24623e6e2a7d67114501c /lib/freebl/Makefile | |
| parent | c5b8b3ab315f6b402aec5d71de84f35c545faa47 (diff) | |
| download | nss-hg-7e759ba8417509336128e6eccd912df5b365f609.tar.gz | |
Bug 1629553 Use order-prereq for $(MAKE_OBJDIR) r=rrelyea
Introduces a simple "%/d" rule to create directories using
$(MAKE_OBJDIR) and replace all explicit $(MAKE_OBJDIR) calls
with an order-only-prerequisites.
To expand the $(@D) prerequisite, this needs .SECONDEXPANSION.
Differential Revision: https://phabricator.services.mozilla.com/D70989
Diffstat (limited to 'lib/freebl/Makefile')
| -rw-r--r-- | lib/freebl/Makefile | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile index bc14679c7..80a5f4395 100644 --- a/lib/freebl/Makefile +++ b/lib/freebl/Makefile @@ -624,12 +624,10 @@ $(OBJDIR)/ldvector$(OBJ_SUFFIX) $(OBJDIR)/loader$(OBJ_SUFFIX) : loader.h ifeq ($(SYSV_SPARC),1) -$(OBJDIR)/mpv_sparcv8.o $(OBJDIR)/mpv_sparcv8x.o $(OBJDIR)/montmulfv8.o : $(OBJDIR)/%.o : %.s - @$(MAKE_OBJDIR) +$(OBJDIR)/mpv_sparcv8.o $(OBJDIR)/mpv_sparcv8x.o $(OBJDIR)/montmulfv8.o : $(OBJDIR)/%.o : %.s | $$(@D)/d $(SOLARIS_AS) -o $@ $(SOLARIS_AS_FLAGS) $< -$(OBJDIR)/mpv_sparcv9.o $(OBJDIR)/montmulfv9.o : $(OBJDIR)/%.o : %.s - @$(MAKE_OBJDIR) +$(OBJDIR)/mpv_sparcv9.o $(OBJDIR)/montmulfv9.o : $(OBJDIR)/%.o : %.s | $$(@D)/d $(SOLARIS_AS) -o $@ $(SOLARIS_AS_FLAGS) $< $(OBJDIR)/mpmontg.o: mpmontg.c montmulf.h @@ -650,8 +648,6 @@ ALL_TRASH += $$($(1)_DIR) ifeq (,$$(filter $$($(1)_DIR)/d,$$(FREEBL_OBJDIRS))) FREEBL_OBJDIRS += $$($(1)_DIR)/d -$$($(1)_DIR)/d: - @$(MAKE_OBJDIR) endif release_md:: freebl_$(2) @@ -679,8 +675,7 @@ endif # FREEBL_CHILD_BUILD # ANSI C's strict aliasing rules. ifeq ($(OS_TARGET),Linux) ifneq ($(CPU_ARCH),x86) -$(OBJDIR)/$(PROG_PREFIX)desblapi$(OBJ_SUFFIX): desblapi.c - @$(MAKE_OBJDIR) +$(OBJDIR)/$(PROG_PREFIX)desblapi$(OBJ_SUFFIX): desblapi.c | $$(@D)/d ifdef NEED_ABSOLUTE_PATH $(CC) -o $@ -c $(CFLAGS) -fno-strict-aliasing $(call core_abspath,$<) else |