Version 3.6.0.4, tag libreoffice-3.6.0.4
[LibreOffice.git] / moz / patches / macosx_build_fix.patch
blobe79f58207fa786960d6a48a1794746ea4918bb14
1 --- misc/mozilla/directory/c-sdk/build.mk 2011-09-27 14:45:02.000000000 +0200
2 +++ misc/build/mozilla/directory/c-sdk/build.mk 2011-09-27 14:44:18.000000000 +0200
3 @@ -157,8 +157,8 @@
4 PLDSBASE=plds$(NSPR_LIBVERSION)
5 NSPRBASE=nspr$(NSPR_LIBVERSION)
7 -DYNAMICNSPR = -l$(PLCBASE) -l$(PLDSBASE) -l$(NSPRBASE)
8 +DYNAMICNSPR = $(NSPR_LIBS)
10 PLC_LIBNAME=plc$(NSPR_LIBVERSION)
11 PLDS_LIBNAME=plds$(NSPR_LIBVERSION)
12 ifeq ($(OS_ARCH), WINNT)
13 --- misc/mozilla/xpcom/build/Makefile.in 2008-06-16 00:26:11.000000000 +0200
14 +++ misc/build/mozilla/xpcom/build/Makefile.in 2011-09-28 10:41:02.000000000 +0200
15 @@ -135,7 +135,7 @@
16 # pull in MoreFiles for MacOSX
17 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
18 EXTRA_DSO_LIBS = macmorefiles_s
19 -EXTRA_DSO_LDOPTS += $(EXTRA_DSO_LIBS)
20 +EXTRA_DSO_LDOPTS += -L$(DIST)/lib $(EXTRA_DSO_LIBS)
21 EXTRA_DEPS += $(DIST)/lib/$(LIB_PREFIX)macmorefiles_s.$(LIB_SUFFIX)
22 endif