mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-16 23:05:42 +00:00
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:
parent
8c798336c5
commit
8eea72d992
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user