Bug 368476 - "pyxpcom linking fails with "unresolvable R_386_GOTOFF relocation"" [p=vamposdecampos@gmail.com (Alex Badea) r=bsmedberg (NPOTB)]

This commit is contained in:
reed%reedloden.com 2008-01-10 09:09:57 +00:00
Родитель 89a5d40708
Коммит 6b3d30c97f
4 изменённых файлов: 10 добавлений и 10 удалений

Просмотреть файл

@ -41,8 +41,8 @@ include $(topsrcdir)/config/config.mk
CXXFLAGS += -DPYTHON_SO=\"libpython$(MOZ_PYTHON_VER_DOTTED).so\" CXXFLAGS += -DPYTHON_SO=\"libpython$(MOZ_PYTHON_VER_DOTTED).so\"
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \ EXTRA_DSO_LDOPTS += $(XPCOM_GLUE_LDOPTS) \
$(XPCOM_GLUE_LDOPTS) \ $(MOZ_COMPONENT_LIBS) \
$(NULL) $(NULL)
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

Просмотреть файл

@ -84,8 +84,8 @@ include $(topsrcdir)/config/config.mk
CXXFLAGS += -DPYTHON_SO=\"libpython$(MOZ_PYTHON_VER_DOTTED).so\" CXXFLAGS += -DPYTHON_SO=\"libpython$(MOZ_PYTHON_VER_DOTTED).so\"
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \ EXTRA_DSO_LDOPTS += $(XPCOM_GLUE_LDOPTS) \
$(XPCOM_GLUE_LDOPTS) \ $(MOZ_COMPONENT_LIBS) \
$(NULL) $(NULL)
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

Просмотреть файл

@ -67,8 +67,8 @@ CPPSRCS = \
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \ EXTRA_DSO_LDOPTS += $(XPCOM_GLUE_LDOPTS) \
$(XPCOM_GLUE_LDOPTS) \ $(MOZ_COMPONENT_LIBS) \
$(NULL) $(NULL)
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

Просмотреть файл

@ -70,13 +70,13 @@ include $(topsrcdir)/config/rules.mk
ifeq ($(OS_ARCH),Darwin) ifeq ($(OS_ARCH),Darwin)
# Don't use the EXTRA_DSO_LDOPTS from rules.mk, it breaks the python module # Don't use the EXTRA_DSO_LDOPTS from rules.mk, it breaks the python module
EXTRA_DSO_LDOPTS = -bundle $(MOZ_COMPONENT_LIBS) \ EXTRA_DSO_LDOPTS = -bundle $(XPCOM_GLUE_LDOPTS) \
$(XPCOM_GLUE_LDOPTS) \ $(MOZ_COMPONENT_LIBS) \
$(NULL) $(NULL)
else else
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \ EXTRA_DSO_LDOPTS += $(XPCOM_GLUE_LDOPTS) \
$(XPCOM_GLUE_LDOPTS) \ $(MOZ_COMPONENT_LIBS) \
$(NULL) $(NULL)
endif endif
IMPORT_LIBRARY := $(SHARED_LIBRARY:.pyd=.lib) IMPORT_LIBRARY := $(SHARED_LIBRARY:.pyd=.lib)