From 11f8c7ff4eb6956a42ea3dba830a0c23a42e0412 Mon Sep 17 00:00:00 2001 From: "reed%reedloden.com" Date: Thu, 10 Jan 2008 09:09:57 +0000 Subject: [PATCH] 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 --- mozilla/extensions/python/dom/src/Makefile.in | 4 ++-- mozilla/extensions/python/xpcom/src/Makefile.in | 4 ++-- mozilla/extensions/python/xpcom/src/loader/Makefile.in | 4 ++-- mozilla/extensions/python/xpcom/src/module/Makefile.in | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mozilla/extensions/python/dom/src/Makefile.in b/mozilla/extensions/python/dom/src/Makefile.in index 4cb5ed7c60a..4d05b260ec9 100644 --- a/mozilla/extensions/python/dom/src/Makefile.in +++ b/mozilla/extensions/python/dom/src/Makefile.in @@ -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 diff --git a/mozilla/extensions/python/xpcom/src/Makefile.in b/mozilla/extensions/python/xpcom/src/Makefile.in index ee21549b3a8..4ee901a6572 100644 --- a/mozilla/extensions/python/xpcom/src/Makefile.in +++ b/mozilla/extensions/python/xpcom/src/Makefile.in @@ -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 diff --git a/mozilla/extensions/python/xpcom/src/loader/Makefile.in b/mozilla/extensions/python/xpcom/src/loader/Makefile.in index 943b3ca9de0..2d17e676357 100644 --- a/mozilla/extensions/python/xpcom/src/loader/Makefile.in +++ b/mozilla/extensions/python/xpcom/src/loader/Makefile.in @@ -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 diff --git a/mozilla/extensions/python/xpcom/src/module/Makefile.in b/mozilla/extensions/python/xpcom/src/module/Makefile.in index c561815aec9..984e2ec812f 100644 --- a/mozilla/extensions/python/xpcom/src/module/Makefile.in +++ b/mozilla/extensions/python/xpcom/src/module/Makefile.in @@ -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)