mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 19:04:45 +00:00
Bug 883339 - Enable gtest on windows TBPL non-PGO builds. r=ted
This commit is contained in:
parent
b161fa67a5
commit
b81d50e1eb
@ -219,7 +219,7 @@ endif
|
||||
COMPILE_CFLAGS += $(COMPILE_PDB_FLAG)
|
||||
COMPILE_CXXFLAGS += $(COMPILE_PDB_FLAG)
|
||||
|
||||
LINK_PDBFILE = $(basename $(@F)).pdb
|
||||
LINK_PDBFILE ?= $(basename $(@F)).pdb
|
||||
ifdef MOZ_DEBUG
|
||||
CODFILE=$(basename $(@F)).cod
|
||||
endif
|
||||
|
@ -9,9 +9,7 @@ include $(topsrcdir)/config/rules.mk
|
||||
|
||||
# Bug 1028035: Linking xul-gtest.dll takes too long, so we disable GTest on
|
||||
# Windows PGO builds.
|
||||
# Bug 1029469: fix_stack_using_bpsyms.py doesn't know how to deal with the
|
||||
# second xul.pdb file that linking xul-gtest.dll creates.
|
||||
ifeq (WINNT,$(OS_ARCH))
|
||||
ifeq (1_WINNT,$(MOZ_PGO)_$(OS_ARCH))
|
||||
SKIP_GTEST_DURING_MAKE_CHECK ?= 1
|
||||
endif
|
||||
|
||||
|
@ -24,4 +24,6 @@ endif
|
||||
$(DIST)/bin/dependentlibs.list.gtest: $(DIST)/bin/dependentlibs.list
|
||||
sed -e 's|$(SHARED_LIBRARY)|gtest/$(SHARED_LIBRARY)|' $< > $@
|
||||
|
||||
LINK_PDBFILE = xul-gtest.pdb
|
||||
|
||||
endif
|
||||
|
Loading…
Reference in New Issue
Block a user