Bug 1014976 - Don't make --enable-debug imply using the debug CRT in FFI. r=ryanvm

build/autoconf/ffi.m4

@@ -48,17 +48,21 @@ if test -z "$BUILDING_JS" -o -n "$JS_STANDALONE"; then
       CFLAGS=
       ac_configure_args="$ac_configure_args LD=link CPP=\"cl -nologo -EP\" \
                          CXXCPP=\"cl -nologo -EP\" SHELL=sh.exe"
+      rtl=
+      if test -n "$MOZ_DEBUG"; then
+        rtl=" -DUSE_DEBUG_RTL"
+      fi
       case "${target_cpu}" in
       x86_64)
         # Need target since MSYS tools into mozilla-build may be 32bit
         ac_configure_args="$ac_configure_args \
-                           CC=\"$_topsrcdir/js/src/ctypes/libffi/msvcc.sh -m64\" \
-                           CXX=\"$_topsrcdir/js/src/ctypes/libffi/msvcc.sh -m64\""
+                           CC=\"$_topsrcdir/js/src/ctypes/libffi/msvcc.sh -m64$rtl\" \
+                           CXX=\"$_topsrcdir/js/src/ctypes/libffi/msvcc.sh -m64$rtl\""
         ;;
       *)
         ac_configure_args="$ac_configure_args \
-                           CC=$_topsrcdir/js/src/ctypes/libffi/msvcc.sh \
-                           CXX=$_topsrcdir/js/src/ctypes/libffi/msvcc.sh"
+                           CC=\"$_topsrcdir/js/src/ctypes/libffi/msvcc.sh$rtl\" \
+                           CXX=\"$_topsrcdir/js/src/ctypes/libffi/msvcc.sh$rtl\""
         ;;
       esac
     fi

js/src/ctypes/libffi-patches/01-1014976-rtl.patch

@@ -0,0 +1,30 @@
+Bug 1014976 - Don't make --enable-debug imply using the debug CRT in FFI
+
+diff --git a/js/src/ctypes/libffi/msvcc.sh b/js/src/ctypes/libffi/msvcc.sh
+--- a/js/src/ctypes/libffi/msvcc.sh
++++ b/js/src/ctypes/libffi/msvcc.sh
+@@ -100,19 +100,23 @@ do
+       shift 1
+     ;;
+     -g)
+       # Enable debug symbol generation.
+       args="$args -Zi"
+       shift 1
+     ;;
+     -DFFI_DEBUG)
+-      # Link against debug CRT and enable runtime error checks.
++      # Enable runtime error checks.
+       args="$args -RTC1"
+       defines="$defines $1"
++      shift 1
++    ;;
++    -DUSE_DEBUG_RTL)
++      # Link against debug CRT.
+       md=-MDd
+       shift 1
+     ;;
+     -c)
+       args="$args -c"
+       args="$(echo $args | sed 's%/Fe%/Fo%g')"
+       single="-c"
+       shift 1

js/src/ctypes/libffi/msvcc.sh

@@ -105,9 +105,13 @@ do
       shift 1
     ;;
     -DFFI_DEBUG)
-      # Link against debug CRT and enable runtime error checks.
+      # Enable runtime error checks.
       args="$args -RTC1"
       defines="$defines $1"
+      shift 1
+    ;;
+    -DUSE_DEBUG_RTL)
+      # Link against debug CRT.
       md=-MDd
       shift 1
     ;;