From c2a0aa0be0801b24ca099cbc4958d9a0be6f6200 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Wed, 12 Feb 2014 08:23:41 -0500 Subject: [PATCH] Backed out changeset 3868202e1747 (bug 883339) for suspected Windows PGO bustage. --- testing/gtest/Makefile.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testing/gtest/Makefile.in b/testing/gtest/Makefile.in index f021e5bc508..a82d7c97643 100644 --- a/testing/gtest/Makefile.in +++ b/testing/gtest/Makefile.in @@ -15,6 +15,11 @@ LOCAL_INCLUDES += \ include $(topsrcdir)/config/rules.mk ifeq (browser,$(MOZ_BUILD_APP)) +# Disable because of metro linking error bug 883339: +# LNK1181: cannot open input file 'runtimeobject.lib' +# And non metro linking error bug 886656: +# LNK1112: module machine type 'x64' conflicts with target machine type 'X86' +ifneq ($(OS_ARCH),WINNT) ifdef COMPILE_ENVIRONMENT check gtest:: $(MAKE) -C $(DEPTH)/toolkit/library gtestxul @@ -24,3 +29,4 @@ endif $(PYTHON) $(topsrcdir)/testing/gtest/rungtests.py --xre-path=$(DIST)/bin --symbols-path=$(DIST)/crashreporter-symbols $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX) endif endif +endif