Bug 1309414 - Specify SINGLE_SHLIB_DIR only once. r?bsmedberg
If $(FREEBL_BUILD_SINGLE_SHLIB) or $(NEED_STUB_BUILD) are defined, the
target $(SINGLE_SHLIB_DIR): is defined, causing a warning about
overriding recipe.
This change specifies target $(SINGLE_SHLIB_DIR) only once.
MozReview-Commit-ID: 1HxChSUq5Zv
--- a/security/nss/lib/freebl/Makefile
+++ b/security/nss/lib/freebl/Makefile
@@ -620,38 +620,34 @@ ifeq ($(SYSV_SPARC),1)
$(OBJDIR)/mpmontg.o: mpmontg.c montmulf.h
endif
ifndef FREEBL_CHILD_BUILD
# Parent build. This is where we decide which shared libraries to build
+ifneq "$(or $(FREEBL_BUILD_SINGLE_SHLIB),$(NEED_STUB_BUILD))" ""
+SINGLE_SHLIB_DIR = $(OBJDIR)/$(OS_TARGET)_SINGLE_SHLIB
+ALL_TRASH += $(SINGLE_SHLIB_DIR)
+$(SINGLE_SHLIB_DIR):
+ -mkdir -p $(SINGLE_SHLIB_DIR)
+endif
+
ifdef FREEBL_BUILD_SINGLE_SHLIB
################### Single shared lib stuff #########################
-SINGLE_SHLIB_DIR = $(OBJDIR)/$(OS_TARGET)_SINGLE_SHLIB
-ALL_TRASH += $(SINGLE_SHLIB_DIR)
-
-$(SINGLE_SHLIB_DIR):
- -mkdir -p $(SINGLE_SHLIB_DIR)
-
release_md libs:: $(SINGLE_SHLIB_DIR)
$(MAKE) FREEBL_CHILD_BUILD=1 \
OBJDIR=$(SINGLE_SHLIB_DIR) $@
######################## common stuff #########################
endif
ifdef NEED_STUB_BUILD
-SINGLE_SHLIB_DIR = $(OBJDIR)/$(OS_TARGET)_SINGLE_SHLIB
-ALL_TRASH += $(SINGLE_SHLIB_DIR)
-$(SINGLE_SHLIB_DIR):
- -mkdir $(SINGLE_SHLIB_DIR)
-
release_md libs:: $(SINGLE_SHLIB_DIR)
$(MAKE) FREEBL_CHILD_BUILD=1 USE_STUB_BUILD=1 \
OBJDIR=$(SINGLE_SHLIB_DIR) $@
endif
# multiple shared libraries
######################## ABI32_FPU stuff #########################