Fix mingw cross-compile bustage.

Bug #322578 r=mark sr=bsmedberg


git-svn-id: svn://10.0.0.236/trunk@192676 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/configure.in

@@ -2343,7 +2343,6 @@ AC_TYPE_MODE_T
 AC_TYPE_OFF_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
-AC_TYPE_UID_T
 AC_STRUCT_ST_BLKSIZE
 AC_MSG_CHECKING(for siginfo_t)
 AC_CACHE_VAL(ac_cv_siginfo_t,

mozilla/js/src/Makefile.in

@@ -336,11 +336,12 @@ endif
 # the mdcpucfg for the target so it needs the appropriate target defines
 ifdef HOST_NSPR_MDCPUCFG
 HOST_CC := $(HOST_CC) -DMDCPUCFG=$(TARGET_NSPR_MDCPUCFG)
+HOST_CFLAGS := $(patsubst -DXP_%,,$(HOST_CFLAGS))
 endif
 
 ifdef CROSS_COMPILE
 # jscpucfg needs to know when it's supposed to produce a config for the target
-JSCPUCFG_DEFINES = -DCROSS_COMPILE=1
+JSCPUCFG_DEFINES = $(ACDEFINES)
 
 # This is incredibly hacky.  Darwin NSPR uses the same MDCPUCFG for multiple
 # processors, and determines which processor to configure for based on
@@ -349,9 +350,9 @@ JSCPUCFG_DEFINES = -DCROSS_COMPILE=1
 # defined here if targeting i386, and explicitly undefined otherwise.
 ifeq ($(OS_ARCH),Darwin)
 ifeq ($(TARGET_CPU),powerpc)
-DEFINES += -Ui386
+JSCPUCFG_DEFINES += -Ui386
 else
-DEFINES += -Di386=1
+JSCPUCFG_DEFINES += -Di386=1
 endif
 endif
 endif