[tor-commits] [tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 1272647 - Exclude NameTable.cpp from unified compilation because #include <cmath> in other source files causes gcc6 compilation failure. r=bas

[gk at torproject.org]

commit e2e11538f13e7eb4aa8bd9daf8f3d89c1434c1ef
Author: Jonathan Kew <jkew at mozilla.com>
Date:   Wed May 18 15:22:54 2016 +0100

    Bug 1272647 - Exclude NameTable.cpp from unified compilation because #include <cmath> in other source files causes gcc6 compilation failure. r=bas
---
 gfx/graphite2/src/moz.build | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gfx/graphite2/src/moz.build b/gfx/graphite2/src/moz.build
index 4008b77..c18c6f4 100644
--- a/gfx/graphite2/src/moz.build
+++ b/gfx/graphite2/src/moz.build
@@ -45,7 +45,6 @@ UNIFIED_SOURCES += [
     'Intervals.cpp',
     'json.cpp',
     'Justifier.cpp',
-    'NameTable.cpp',
     'Pass.cpp',
     'Position.cpp',
     'SegCache.cpp',
@@ -59,6 +58,12 @@ UNIFIED_SOURCES += [
     'UtfCodec.cpp',
 ]
 
+# Excluded from UNIFIED_SOURCES because <cmath> from other files breaks it,
+# see bug 1272647.
+SOURCES += [
+    'NameTable.cpp',
+]
+
 # tell graphite2 not to export symbols, we'll be linking it directly with
 # thebes
 DEFINES['GRAPHITE2_STATIC'] = True