Index: mozvoikko/src/Makefile.in
===================================================================
--- mozvoikko/src/Makefile.in	(revision 3638)
+++ mozvoikko/src/Makefile.in	(working copy)
@@ -68,6 +68,7 @@
 MOZVOIKKO_LINUX_X86_GCC3_EXTRA_LIBS = $(patsubst lib%, $(srcdir)/voikko-libs/Linux_x86-gcc3/lib%, $(LINUX_EXTRA_LIBS))
 MOZVOIKKO_LINUX_X86_64_GCC3_EXTRA_LIBS = $(patsubst lib%, $(srcdir)/voikko-libs/Linux_x86_64-gcc3/lib%, $(LINUX_EXTRA_LIBS))
 MOZVOIKKO_DARWIN_X86_GCC3_EXTRA_LIBS = $(patsubst lib%, $(srcdir)/voikko-libs/Darwin_x86-gcc3/lib%, $(DARWIN_EXTRA_LIBS))
+MOZVOIKKO_DARWIN_X86_64_GCC3_EXTRA_LIBS = $(patsubst lib%, $(srcdir)/voikko-libs/Darwin_x86_64-gcc3/lib%, $(DARWIN_EXTRA_LIBS))
 MOZVOIKKO_DARWIN_PPC_GCC3_EXTRA_LIBS = $(patsubst lib%, $(srcdir)/voikko-libs/Darwin_ppc-gcc3/lib%, $(DARWIN_EXTRA_LIBS))
 SUOMI_MALAGA_FILES = $(srcdir)/voikko-data/*
 
@@ -95,6 +96,12 @@
 XPCOM_GLUE_NOMOZALLOC_LDOPTS = $(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s_nomozalloc.$(LIB_SUFFIX) -L$(LIBXUL_DIST)/lib -lxpcom
 endif
 
+ifeq ($(OS_ARCH)_$(TARGET_XPCOM_ABI),Darwin_x86_64-gcc3)
+MOZVOIKKO_EXTRA_LIBS = $(MOZVOIKKO_DARWIN_X86_64_GCC3_EXTRA_LIBS)
+MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS=-Wl,-exported_symbols_list -Wl,$(srcdir)/gnu-ld-scripts/components-export-list
+XPCOM_GLUE_NOMOZALLOC_LDOPTS = $(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s_nomozalloc.$(LIB_SUFFIX) -L$(LIBXUL_DIST)/lib -lxpcom
+endif
+
 ifeq ($(OS_ARCH)_$(TARGET_XPCOM_ABI),Darwin_ppc-gcc3)
 MOZVOIKKO_EXTRA_LIBS = $(MOZVOIKKO_DARWIN_PPC_GCC3_EXTRA_LIBS)
 MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS=-Wl,-exported_symbols_list -Wl,$(srcdir)/gnu-ld-scripts/components-export-list
@@ -165,7 +172,7 @@
 check-extra-files:	$(MOZVOIKKO_EXTRA_LIBS) $(SUOMI_MALAGA_FILES)
 
 check-all-extra-files:	$(MOZVOIKKO_WINNT_X86_MSVC_EXTRA_LIBS) $(MOZVOIKKO_LINUX_X86_GCC3_EXTRA_LIBS) \
-	$(MOZVOIKKO_LINUX_X86_64_GCC3_EXTRA_LIBS) $(MOZVOIKKO_DARWIN_X86_GCC3_EXTRA_LIBS) $(MOZVOIKKO_DARWIN_PPC_GCC3_EXTRA_LIBS) $(SUOMI_MALAGA_FILES)
+	$(MOZVOIKKO_LINUX_X86_64_GCC3_EXTRA_LIBS) $(MOZVOIKKO_DARWIN_X86_GCC3_EXTRA_LIBS) $(MOZVOIKKO_DARWIN_X86_64_GCC3_EXTRA_LIBS) $(MOZVOIKKO_DARWIN_PPC_GCC3_EXTRA_LIBS) $(SUOMI_MALAGA_FILES)
 
 clean::
 	rm -f install.rdf s-extra-libs chrome.manifest


