From 65e93ade37812014393dcaa4404fcd21e60ad693 Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Wed, 10 Mar 2010 15:35:31 -0500
Subject: [PATCH] follow up to bug 548207, test for WINCE instead of
 CROSS_COMPILE due to make check failure on OSX

--HG--
extra : rebase_source : 2b0ab634f5286e6317e147daa0cd790f633acdbf
---
 Makefile.in             | 2 +-
 config/config.mk        | 2 +-
 js/src/Makefile.in      | 2 +-
 js/src/config/config.mk | 2 +-
 xpcom/tests/Makefile.in | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index a7aeb1a633f..0eb210c3cc7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -85,7 +85,7 @@ DIST_GARBAGE = config.cache config.log config.status config-defs.h \
    netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \
    $(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out
 
-ifdef CROSS_COMPILE
+ifdef WINCE
 check::
 	$(PYTHON) $(topsrcdir)/build/mobile/devicemanager-utils.py copy $(DIST)/bin
 endif
diff --git a/config/config.mk b/config/config.mk
index 767a539ee1f..d00c84a8f2c 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -817,7 +817,7 @@ MAKE_JARS_FLAGS += -c $(topsrcdir)/$(relativesrcdir)/en-US
 endif
 endif
 
-ifdef CROSS_COMPILE
+ifdef WINCE
 RUN_TEST_PROGRAM = $(PYTHON) $(topsrcdir)/build/mobile/devicemanager-run-test.py
 else
 ifeq (,$(filter WINCE WINNT OS2,$(OS_ARCH)))
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 8216b6dc4a1..7b9950d1fd4 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -365,7 +365,7 @@ check-valgrind::
 endif
 
 ifdef ENABLE_TRACEJIT
-ifndef CROSS_COMPILE
+ifndef WINCE
 check::
 	$(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON) -u $(srcdir)/trace-test/trace-test.py \
 	        --no-slow --no-progress --tinderbox $(DIST)/bin/js$(BIN_SUFFIX)
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index 767a539ee1f..d00c84a8f2c 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -817,7 +817,7 @@ MAKE_JARS_FLAGS += -c $(topsrcdir)/$(relativesrcdir)/en-US
 endif
 endif
 
-ifdef CROSS_COMPILE
+ifdef WINCE
 RUN_TEST_PROGRAM = $(PYTHON) $(topsrcdir)/build/mobile/devicemanager-run-test.py
 else
 ifeq (,$(filter WINCE WINNT OS2,$(OS_ARCH)))
diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in
index 287cd318ab5..02ee02dd1f4 100644
--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@@ -184,7 +184,7 @@ endif
 
 abs_srcdir = $(shell cd $(srcdir) && pwd)
 
-ifdef CROSS_COMPILE
+ifdef WINCE
 DM_RM = $(PYTHON) $(topsrcdir)/build/mobile/devicemanager-utils.py delete
 DM_CP = $(PYTHON) $(topsrcdir)/build/mobile/devicemanager-utils.py copy