mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-21 17:59:34 +00:00
bug 506845 targets are not rebuilt when archives from EXPAND_LIBNAME change r=bsmedberg
This commit is contained in:
parent
3667f6c4cb
commit
1a97ad8bbb
@ -154,7 +154,7 @@ MOZ_WIDGET_SUPPORT_LIBS = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFF
|
||||
|
||||
ifdef MOZ_MEMORY
|
||||
ifneq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
|
||||
JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(call EXPAND_LIBNAME_PATH,jemalloc,$(DIST)/lib) $(MKSHLIB_UNFORCE_ALL)
|
||||
JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(call EXPAND_MOZLIBNAME,jemalloc) $(MKSHLIB_UNFORCE_ALL)
|
||||
endif
|
||||
endif
|
||||
|
||||
|
@ -833,6 +833,23 @@ LIBS_DEPS = $(filter %.$(LIB_SUFFIX), $(LIBS))
|
||||
HOST_LIBS_DEPS = $(filter %.$(LIB_SUFFIX), $(HOST_LIBS))
|
||||
DSO_LDOPTS_DEPS = $(EXTRA_DSO_LIBS) $(filter %.$(LIB_SUFFIX), $(EXTRA_DSO_LDOPTS))
|
||||
|
||||
ifndef _LIBNAME_RELATIVE_PATHS
|
||||
|
||||
LIBS_DEPS += $(filter -l%, $(LIBS))
|
||||
HOST_LIBS_DEPS += $(filter -l%, $(HOST_LIBS))
|
||||
DSO_LDOPTS_DEPS += $(filter -l%, $(EXTRA_DSO_LDOPTS))
|
||||
|
||||
_LIBDIRS = $(patsubst -L%,%,$(filter -L%, $(LIBS) $(HOST_LIBS) $(EXTRA_DSO_LDOPTS)))
|
||||
ifneq (,$(_LIBDIRS))
|
||||
vpath $(LIB_PREFIX)%.$(LIB_SUFFIX) $(_LIBDIRS)
|
||||
ifdef IMPORT_LIB_SUFFIX
|
||||
vpath $(LIB_PREFIX)%.$(IMPORT_LIB_SUFFIX) $(_LIBDIRS)
|
||||
endif # IMPORT_LIB_SUFFIX
|
||||
vpath $(DLL_PREFIX)%$(DLL_SUFFIX) $(_LIBDIRS)
|
||||
endif # _LIBDIRS
|
||||
|
||||
endif # _LIBNAME_RELATIVE_PATHS
|
||||
|
||||
# Dependancies which, if modified, should cause everything to rebuild
|
||||
GLOBAL_DEPS += Makefile Makefile.in $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk
|
||||
|
||||
|
@ -154,7 +154,7 @@ MOZ_WIDGET_SUPPORT_LIBS = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFF
|
||||
|
||||
ifdef MOZ_MEMORY
|
||||
ifneq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
|
||||
JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(call EXPAND_LIBNAME_PATH,jemalloc,$(DIST)/lib) $(MKSHLIB_UNFORCE_ALL)
|
||||
JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(call EXPAND_MOZLIBNAME,jemalloc) $(MKSHLIB_UNFORCE_ALL)
|
||||
endif
|
||||
endif
|
||||
|
||||
|
@ -833,6 +833,23 @@ LIBS_DEPS = $(filter %.$(LIB_SUFFIX), $(LIBS))
|
||||
HOST_LIBS_DEPS = $(filter %.$(LIB_SUFFIX), $(HOST_LIBS))
|
||||
DSO_LDOPTS_DEPS = $(EXTRA_DSO_LIBS) $(filter %.$(LIB_SUFFIX), $(EXTRA_DSO_LDOPTS))
|
||||
|
||||
ifndef _LIBNAME_RELATIVE_PATHS
|
||||
|
||||
LIBS_DEPS += $(filter -l%, $(LIBS))
|
||||
HOST_LIBS_DEPS += $(filter -l%, $(HOST_LIBS))
|
||||
DSO_LDOPTS_DEPS += $(filter -l%, $(EXTRA_DSO_LDOPTS))
|
||||
|
||||
_LIBDIRS = $(patsubst -L%,%,$(filter -L%, $(LIBS) $(HOST_LIBS) $(EXTRA_DSO_LDOPTS)))
|
||||
ifneq (,$(_LIBDIRS))
|
||||
vpath $(LIB_PREFIX)%.$(LIB_SUFFIX) $(_LIBDIRS)
|
||||
ifdef IMPORT_LIB_SUFFIX
|
||||
vpath $(LIB_PREFIX)%.$(IMPORT_LIB_SUFFIX) $(_LIBDIRS)
|
||||
endif # IMPORT_LIB_SUFFIX
|
||||
vpath $(DLL_PREFIX)%$(DLL_SUFFIX) $(_LIBDIRS)
|
||||
endif # _LIBDIRS
|
||||
|
||||
endif # _LIBNAME_RELATIVE_PATHS
|
||||
|
||||
# Dependancies which, if modified, should cause everything to rebuild
|
||||
GLOBAL_DEPS += Makefile Makefile.in $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk
|
||||
|
||||
|
@ -55,7 +55,7 @@ CPPSRCS = \
|
||||
intcnt.cpp \
|
||||
$(NULL)
|
||||
|
||||
LIBS = \
|
||||
OS_LIBS = \
|
||||
-lbfd \
|
||||
-liberty \
|
||||
$(NULL)
|
||||
|
Loading…
x
Reference in New Issue
Block a user