wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 883339 - Enable gtest on windows TBPL non-PGO builds. r=ted

Browse Source
This commit is contained in:
Mike Hommey 2014-06-26 07:59:24 +09:00
parent b02a375963
commit ccdc7b4993
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/rules.mk
View File

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

4
testing/gtest/Makefile.in
View File

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

2
toolkit/library/gtest/Makefile.in
View File

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