Bug 1121813 - Make |configure| abort if attempting a Win64 build with a 32-bit toolchain. r=glandium.
authorNicholas Nethercote <nnethercote@mozilla.com>
Thu, 15 Jan 2015 15:12:38 -0800
changeset 224126 126ed538e9b65f0feb8f147756c7f5c4eadb3bd1
parent 224125 4da7a5d01ad93bf895e6d9f7f206f0e05aa0e7b0
child 224127 a4f38467bc4ecd81e7d6f2601b9de1a15dde8c4a
push id54125
push usernnethercote@mozilla.com
push dateFri, 16 Jan 2015 02:16:06 +0000
treeherdermozilla-inbound@126ed538e9b6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1121813
milestone38.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1121813 - Make |configure| abort if attempting a Win64 build with a 32-bit toolchain. r=glandium.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -2361,16 +2361,19 @@ ia64*-hpux*)
             if test -z "$CLANG_CL"; then
                 LDFLAGS="$LDFLAGS -SAFESEH"
             fi
         fi
 
         AC_DEFINE(_X86_)
         ;;
     x86_64-*)
+        if test -z "$HAVE_64BIT_BUILD"; then
+            AC_MSG_ERROR([You are targeting 64-bit but using the 32-bit compiler.])
+        fi
         if test -n "$_WIN32_MSVC"; then
             DSO_LDOPTS="$DSO_LDOPTS -MACHINE:X64"
         fi
         AC_DEFINE(_AMD64_)
         ;;
     *)
         AC_DEFINE(_CPU_ARCH_NOT_DEFINED)
         ;;