follow up to bug 548207, test for WINCE instead of CROSS_COMPILE due to make check failure on OSX

--HG--
extra : rebase_source : 2b0ab634f5286e6317e147daa0cd790f633acdbf
This commit is contained in:
Brad Lassey 2010-03-10 15:35:31 -05:00
Родитель 0bb1fd1a52
Коммит fa40636782
5 изменённых файлов: 5 добавлений и 5 удалений

Просмотреть файл

@ -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 \ netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \
$(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out $(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out
ifdef CROSS_COMPILE ifdef WINCE
check:: check::
$(PYTHON) $(topsrcdir)/build/mobile/devicemanager-utils.py copy $(DIST)/bin $(PYTHON) $(topsrcdir)/build/mobile/devicemanager-utils.py copy $(DIST)/bin
endif endif

Просмотреть файл

@ -817,7 +817,7 @@ MAKE_JARS_FLAGS += -c $(topsrcdir)/$(relativesrcdir)/en-US
endif endif
endif endif
ifdef CROSS_COMPILE ifdef WINCE
RUN_TEST_PROGRAM = $(PYTHON) $(topsrcdir)/build/mobile/devicemanager-run-test.py RUN_TEST_PROGRAM = $(PYTHON) $(topsrcdir)/build/mobile/devicemanager-run-test.py
else else
ifeq (,$(filter WINCE WINNT OS2,$(OS_ARCH))) ifeq (,$(filter WINCE WINNT OS2,$(OS_ARCH)))

Просмотреть файл

@ -365,7 +365,7 @@ check-valgrind::
endif endif
ifdef ENABLE_TRACEJIT ifdef ENABLE_TRACEJIT
ifndef CROSS_COMPILE ifndef WINCE
check:: check::
$(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON) -u $(srcdir)/trace-test/trace-test.py \ $(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON) -u $(srcdir)/trace-test/trace-test.py \
--no-slow --no-progress --tinderbox $(DIST)/bin/js$(BIN_SUFFIX) --no-slow --no-progress --tinderbox $(DIST)/bin/js$(BIN_SUFFIX)

Просмотреть файл

@ -817,7 +817,7 @@ MAKE_JARS_FLAGS += -c $(topsrcdir)/$(relativesrcdir)/en-US
endif endif
endif endif
ifdef CROSS_COMPILE ifdef WINCE
RUN_TEST_PROGRAM = $(PYTHON) $(topsrcdir)/build/mobile/devicemanager-run-test.py RUN_TEST_PROGRAM = $(PYTHON) $(topsrcdir)/build/mobile/devicemanager-run-test.py
else else
ifeq (,$(filter WINCE WINNT OS2,$(OS_ARCH))) ifeq (,$(filter WINCE WINNT OS2,$(OS_ARCH)))

Просмотреть файл

@ -184,7 +184,7 @@ endif
abs_srcdir = $(shell cd $(srcdir) && pwd) abs_srcdir = $(shell cd $(srcdir) && pwd)
ifdef CROSS_COMPILE ifdef WINCE
DM_RM = $(PYTHON) $(topsrcdir)/build/mobile/devicemanager-utils.py delete DM_RM = $(PYTHON) $(topsrcdir)/build/mobile/devicemanager-utils.py delete
DM_CP = $(PYTHON) $(topsrcdir)/build/mobile/devicemanager-utils.py copy DM_CP = $(PYTHON) $(topsrcdir)/build/mobile/devicemanager-utils.py copy