Bug 570334: Support a CPU_ARCH of x86_64, which is set by mingw-w64. The
authorwtc%google.com
Wed, 23 Jun 2010 23:28:52 +0000
changeset 9686 7fc17a93466dcaeeb971cc76bdea4fcbf1a67aab
parent 9685 774fafeece47e2b4a0bff966c8fb679ee9f13823
child 9687 34e88cc1a5a744a7f324ee8ee576f21c81be20eb
push idunknown
push userunknown
push dateunknown
bugs570334
Bug 570334: Support a CPU_ARCH of x86_64, which is set by mingw-w64. The patch is contributed by Jacek Caban <jacek@codeweavers.com>. r=wtc.
security/coreconf/WIN32.mk
--- a/security/coreconf/WIN32.mk
+++ b/security/coreconf/WIN32.mk
@@ -172,17 +172,17 @@ endif # !MSVC6
 endif # NS_USE_GCC
 
 ifdef USE_64
 DEFINES += -DWIN64
 else
 DEFINES += -DWIN32
 endif
 
-ifeq ($(CPU_ARCH), x386)
+ifeq (,$(filter-out x386 x86_64,$(CPU_ARCH)))
 ifdef USE_64
 	DEFINES += -D_AMD64_
 else
 	DEFINES += -D_X86_
 endif
 endif
 ifeq ($(CPU_ARCH), ALPHA)
 	DEFINES += -D_ALPHA_=1