From 6687aadee1c8da2ee4daeaebe97fac398f98f252 Mon Sep 17 00:00:00 2001 From: "mhammond%skippinet.com.au" Date: Mon, 23 Jan 2006 21:59:18 +0000 Subject: [PATCH] Get pyxpcom building on osx. Not part of the default build. git-svn-id: svn://10.0.0.236/trunk@188061 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/python/xpcom/src/Makefile.in | 7 +------ mozilla/extensions/python/xpcom/src/module/Makefile.in | 7 ++++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mozilla/extensions/python/xpcom/src/Makefile.in b/mozilla/extensions/python/xpcom/src/Makefile.in index e41d08c929f..965da7f9544 100644 --- a/mozilla/extensions/python/xpcom/src/Makefile.in +++ b/mozilla/extensions/python/xpcom/src/Makefile.in @@ -86,12 +86,7 @@ CPPSRCS= \ include $(topsrcdir)/config/config.mk 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) -else - EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) -endif +EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) clobber:: rm -f *.ilk *.pdb *.exp *.lib *.pyd diff --git a/mozilla/extensions/python/xpcom/src/module/Makefile.in b/mozilla/extensions/python/xpcom/src/module/Makefile.in index f39f742b511..0b5f44afb70 100644 --- a/mozilla/extensions/python/xpcom/src/module/Makefile.in +++ b/mozilla/extensions/python/xpcom/src/module/Makefile.in @@ -69,7 +69,12 @@ CPPSRCS= \ include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk -EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) +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) +else + EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) +endif IMPORT_LIBRARY := $(SHARED_LIBRARY:.pyd=.lib) # Install into our Python directory