Backed out changeset 3868202e1747 (bug 883339) for suspected Windows PGO bustage.

This commit is contained in:
Ryan VanderMeulen 2014-02-12 08:23:41 -05:00
parent eacee9b6d7
commit 062b547cf8

View File

@ -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