mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
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:
parent
269ef04f37
commit
65e93ade37
@ -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
|
||||
|
@ -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)))
|
||||
|
@ -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)
|
||||
|
@ -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)))
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user