зеркало из https://github.com/mozilla/pjs.git
Add LIBS_DIR to the link line before EXTRA_DSO_LIBS to avoid link-ordering issues on linkers that care (e.g,Sun Forte 7).
Bug #137762 r=dcran
This commit is contained in:
Родитель
a395b44008
Коммит
9c09e6728f
|
@ -45,6 +45,7 @@ REQUIRES = xpcom \
|
|||
CPPSRCS = nsBMPDecoder.cpp nsICODecoder.cpp nsBMPModule.cpp
|
||||
|
||||
EXTRA_DSO_LDOPTS = \
|
||||
$(LIBS_DIR) \
|
||||
$(EXTRA_DSO_LIBS) \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(NULL)
|
||||
|
|
|
@ -42,7 +42,9 @@ REQUIRES = xpcom \
|
|||
|
||||
CPPSRCS = GIF2.cpp nsGIFDecoder2.cpp nsGIFModule.cpp
|
||||
|
||||
EXTRA_DSO_LDOPTS = $(GIF_LIBS) \
|
||||
EXTRA_DSO_LDOPTS = \
|
||||
$(LIBS_DIR) \
|
||||
$(GIF_LIBS) \
|
||||
$(EXTRA_DSO_LIBS) \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(NULL)
|
||||
|
|
|
@ -44,7 +44,9 @@ REQUIRES = xpcom \
|
|||
|
||||
CPPSRCS = nsJPEGDecoder.cpp nsJPEGFactory.cpp
|
||||
|
||||
EXTRA_DSO_LDOPTS = $(JPEG_LIBS) \
|
||||
EXTRA_DSO_LDOPTS = \
|
||||
$(LIBS_DIR) \
|
||||
$(JPEG_LIBS) \
|
||||
$(EXTRA_DSO_LIBS) \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(NULL)
|
||||
|
|
|
@ -44,7 +44,9 @@ REQUIRES = string \
|
|||
|
||||
CPPSRCS = nsMNGDecoder.cpp nsMNGFactory.cpp imgContainerMNG.cpp
|
||||
|
||||
EXTRA_DSO_LDOPTS = $(MNG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) \
|
||||
EXTRA_DSO_LDOPTS = \
|
||||
$(LIBS_DIR) \
|
||||
$(MNG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) \
|
||||
$(EXTRA_DSO_LIBS) \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(NULL)
|
||||
|
|
|
@ -44,7 +44,9 @@ REQUIRES = xpcom \
|
|||
|
||||
CPPSRCS = nsPNGDecoder.cpp nsPNGFactory.cpp
|
||||
|
||||
EXTRA_DSO_LDOPTS = $(PNG_LIBS) $(ZLIB_LIBS) \
|
||||
EXTRA_DSO_LDOPTS = \
|
||||
$(LIBS_DIR) \
|
||||
$(PNG_LIBS) $(ZLIB_LIBS) \
|
||||
$(EXTRA_DSO_LIBS) \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(NULL)
|
||||
|
|
Загрузка…
Ссылка в новой задаче