Bug 714495 - Port - |Microsoft.VC80.CRT SideBySide errors, browsercomps.dll| to comm. r+a=Standard8
authorJustin Wood <Callek@gmail.com>
Sun, 01 Jan 2012 01:15:17 -0500
changeset 9806 640523dc5946e1f8de346ac7470fd57715e129c7
parent 9805 deacf4a4689592565a91415046c1d35e28ba137b
child 9807 586c4329cde7881a002221a7eba311b79f300911
push id322
push userCallek@gmail.com
push dateSat, 21 Jan 2012 13:32:05 +0000
treeherdercomm-beta@640523dc5946 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs714495
Bug 714495 - Port - |Microsoft.VC80.CRT SideBySide errors, browsercomps.dll| to comm. r+a=Standard8
mail/components/build/Makefile.in
suite/build/Makefile.in
--- a/mail/components/build/Makefile.in
+++ b/mail/components/build/Makefile.in
@@ -37,16 +37,19 @@
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+# NOTE: if we switch away from LIBXUL_LIBRARY at any stage
+# we need to clear the EMBED_MANIFEST_AT flag. (See Bug 714495)
+
 MODULE		= mailcomps
 LIBRARY_NAME	= mailcomps
 SHORT_LIBNAME	= mailcmp
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMailCompsModule
 LIBXUL_LIBRARY = 1
 MOZILLA_INTERNAL_API = 1
--- a/suite/build/Makefile.in
+++ b/suite/build/Makefile.in
@@ -89,8 +89,11 @@ EXTRA_DSO_LDOPTS += \
 # Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code)
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 EXTRA_DSO_LDOPTS += \
 	$(TK_LIBS) \
 	$(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
+
+# Ensure that we don't embed a manifest referencing the CRT.
+EMBED_MANIFEST_AT =