Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-26 14:46:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 886656 - Disable GTest on Windows. r=gps

Browse Source
This commit is contained in:
Benoit Girard 2013-07-18 16:29:17 -04:00
parent 1591216c2a
commit 3b848ad3cd
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
testing/gtest/Makefile.in
View File

@ -30,9 +30,11 @@ LOCAL_INCLUDES += \
include $(topsrcdir)/config/rules.mk
ifeq (browser,$(MOZ_BUILD_APP))
# Disable because of metro linking error:
# Disable because of metro linking error bug 883339:
# LNK1181: cannot open input file 'runtimeobject.lib'
ifndef MOZ_METRO
# And non metro linking error bug 886656:
# LNK1112: module machine type 'x64' conflicts with target machine type 'X86'
ifneq ($(OS_ARCH),WINNT)
check gtest::
$(MAKE) -C $(DEPTH)/toolkit/library gtestxul
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))