mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 12:25:53 +00:00
Fix warning on Windows builds. Bug 104541.
This commit is contained in:
parent
63333b5253
commit
e2f58af25a
@ -323,7 +323,7 @@ SUB_SHLOBJS = $(foreach dir,$(SHARED_LIBRARY_DIRS),$(addprefix $(dir)/,$(shell $
|
||||
endif
|
||||
endif
|
||||
|
||||
$(SHARED_LIBRARY): $(OBJS) $(MAPFILE)
|
||||
$(SHARED_LIBRARY): $(OBJS) $(RES) $(MAPFILE)
|
||||
@$(MAKE_OBJDIR)
|
||||
rm -f $@
|
||||
ifeq ($(OS_TARGET)$(OS_RELEASE), AIX4.1)
|
||||
@ -336,7 +336,7 @@ ifeq ($(OS_TARGET)$(OS_RELEASE), AIX4.1)
|
||||
-bM:SRE -bnoentry $(OS_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
|
||||
else
|
||||
ifeq (,$(filter-out WIN%,$(OS_TARGET)))
|
||||
$(LINK_DLL) -MAP $(DLLBASE) $(subst /,\\,$(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS))
|
||||
$(LINK_DLL) -MAP $(DLLBASE) $(subst /,\\,$(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS) $(RES))
|
||||
else
|
||||
ifeq ($(OS_TARGET),OS2)
|
||||
@cmd /C "echo LIBRARY $(notdir $(basename $(SHARED_LIBRARY))) INITINSTANCE TERMINSTANCE >$@.def"
|
||||
|
@ -146,7 +146,7 @@ ifndef OBJS
|
||||
$(BUILT_CSRCS:.c=$(OBJ_SUFFIX)) \
|
||||
$(BUILT_CPPSRCS:.cpp=$(OBJ_SUFFIX)) \
|
||||
$(BUILT_ASFILES:$(ASM_SUFFIX)=$(OBJ_SUFFIX))
|
||||
OBJS = $(addprefix $(OBJDIR)/$(PROG_PREFIX), $(SIMPLE_OBJS)) $(RES)
|
||||
OBJS = $(addprefix $(OBJDIR)/$(PROG_PREFIX), $(SIMPLE_OBJS))
|
||||
endif
|
||||
|
||||
ifndef BUILT_SRCS
|
||||
|
Loading…
Reference in New Issue
Block a user