equal
deleted
inserted
replaced
1 |
|
2 # HG changeset patch |
|
3 # User Jonathan Kew <jkew@mozilla.com> |
|
4 # Date 1463581374 -3600 |
|
5 # Node ID 9c57b7cacffc57ec3919a2cf3b5ce861e0cf3842 |
|
6 # Parent ea7843420fe518b772c7b259d8ff47193fc5b79e |
|
7 Bug 1272647 - Exclude NameTable.cpp from unified compilation because #include <cmath> in other source files causes gcc6 compilation failure. r=bas |
|
8 |
|
9 diff --git a/gfx/graphite2/src/moz.build b/gfx/graphite2/src/moz.build |
|
10 --- a/gfx/graphite2/src/moz.build |
|
11 +++ b/gfx/graphite2/src/moz.build |
|
12 @@ -40,30 +40,35 @@ UNIFIED_SOURCES += [ |
|
13 'gr_features.cpp', |
|
14 'gr_font.cpp', |
|
15 'gr_logging.cpp', |
|
16 'gr_segment.cpp', |
|
17 'gr_slot.cpp', |
|
18 'Intervals.cpp', |
|
19 'json.cpp', |
|
20 'Justifier.cpp', |
|
21 - 'NameTable.cpp', |
|
22 'Pass.cpp', |
|
23 'Position.cpp', |
|
24 'SegCache.cpp', |
|
25 'SegCacheEntry.cpp', |
|
26 'SegCacheStore.cpp', |
|
27 'Segment.cpp', |
|
28 'Silf.cpp', |
|
29 'Slot.cpp', |
|
30 'Sparse.cpp', |
|
31 'TtfUtil.cpp', |
|
32 'UtfCodec.cpp', |
|
33 ] |
|
34 |
|
35 +# Excluded from UNIFIED_SOURCES because <cmath> from other files breaks it, |
|
36 +# see bug 1272647. |
|
37 +SOURCES += [ |
|
38 + 'NameTable.cpp', |
|
39 +] |
|
40 + |
|
41 # tell graphite2 not to export symbols, we'll be linking it directly with |
|
42 # thebes |
|
43 DEFINES['GRAPHITE2_STATIC'] = True |
|
44 |
|
45 # We allow warnings for third-party code that can be updated from upstream. |
|
46 ALLOW_COMPILER_WARNINGS = True |
|
47 |
|
48 FINAL_LIBRARY = 'gkmedias' |
|
49 |
|
50 |
|