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 941854 - Protect against two known bad patterns for unified builds; r=glandium

Browse Source
This commit is contained in:
Ehsan Akhgari 2013-11-25 20:38:30 -05:00
parent 622635d7b0
commit f2a869c3b2
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
python/mozbuild/mozbuild/backend/recursivemake.py
View File

@ -373,7 +373,8 @@ class RecursiveMakeBackend(CommonBackend):
unified_suffix=unified_suffixes[k],
unified_files_makefile_variable=k,
include_curdir_build_rules=False,
files_per_unified_file=files_per_unification)
files_per_unified_file=files_per_unification,
unified_checks=True)
backend_file.write('%s += $(%s)\n' % (k[len('UNIFIED_'):], k))
else:
backend_file.write('%s += %s\n' % (
@ -599,6 +600,7 @@ class RecursiveMakeBackend(CommonBackend):
unified_files_makefile_variable='unified_files',
include_curdir_build_rules=True,
poison_windows_h=False,
unified_checks=False,
files_per_unified_file=16):
explanation = "\n" \
@ -652,6 +654,19 @@ class RecursiveMakeBackend(CommonBackend):
'#ifdef _WINDOWS_\n'
'#error "%(cppfile)s included windows.h"\n'
"#endif")
if unified_checks:
includeTemplate += (
'\n'
'#ifdef PL_ARENA_CONST_ALIGN_MASK\n'
'#error "%(cppfile)s uses PL_ARENA_CONST_ALIGN_MASK, '
'so it cannot be built in unified mode."\n'
'#undef PL_ARENA_CONST_ALIGN_MASK\n'
'#endif\n'
'#ifdef FORCE_PR_LOG\n'
'#error "%(cppfile)s forces NSPR logging, '
'so it cannot be built in unified mode."\n'
'#undef FORCE_PR_LOG\n'
'#endif')
f.write('\n'.join(includeTemplate % { "cppfile": s } for
s in source_filenames))