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

git-svn-id: svn://10.0.0.236/trunk@242814 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
reed%reedloden.com
2008-01-10 09:09:57 +00:00
parent 965f7de239
commit 11f8c7ff4e
4 changed files with 10 additions and 10 deletions

View File

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

View File

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

View File

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

View File

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