Bug 1429830 - Enable TFO is a cross-compiler is used.r=nwgh
authorDragana Damjanovic <dd.mozilla@gmail.com>
Thu, 11 Jan 2018 23:17:44 +0100
changeset 453219 26e7833d765cd58d15065721498dc6182400b3fd
parent 453218 6375ac1de3900b02bd873d29533060b3f447cd2f
child 453220 f20af1b96e110f04e8514a224cf97140f1b08711
push id1648
push usermtabara@mozilla.com
push dateThu, 01 Mar 2018 12:45:47 +0000
treeherdermozilla-release@cbb9688c2eeb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnwgh
bugs1429830
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1429830 - Enable TFO is a cross-compiler is used.r=nwgh
config/external/nspr/pr/moz.build
netwerk/protocol/http/moz.build
--- a/config/external/nspr/pr/moz.build
+++ b/config/external/nspr/pr/moz.build
@@ -35,17 +35,21 @@ elif CONFIG['OS_TARGET'] in ('FreeBSD', 
         HAVE_BSD_FLOCK=True,
         HAVE_SOCKLEN_T=True,
         HAVE_POINTER_LOCALTIME_R=True,
     )
     DEFINES[CONFIG['OS_TARGET'].upper()] = True
     SOURCES += ['/nsprpub/pr/src/md/unix/%s.c' % CONFIG['OS_TARGET'].lower()]
 elif CONFIG['OS_TARGET'] == 'Darwin':
     OS_LIBS += ['-framework CoreServices']
-    if CONFIG['HOST_MAJOR_VERSION'] >= '15':
+    if not CONFIG['HOST_MAJOR_VERSION']:
+        DEFINES.update(
+            HAS_CONNECTX=True,
+        )
+    elif CONFIG['HOST_MAJOR_VERSION'] >= '15':
         DEFINES.update(
             HAS_CONNECTX=True,
         )
     DEFINES.update(
         DARWIN=True,
         HAVE_BSD_FLOCK=True,
         HAVE_SOCKLEN_T=True,
         HAVE_POINTER_LOCALTIME_R=True,
--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@@ -130,12 +130,16 @@ LOCAL_INCLUDES += [
 EXTRA_COMPONENTS += [
     'UAOverridesBootstrapper.js',
     'UAOverridesBootstrapper.manifest',
     'WellKnownOpportunisticUtils.js',
     'WellKnownOpportunisticUtils.manifest',
 ]
 
 if CONFIG['OS_TARGET'] == 'Darwin':
-    if CONFIG['HOST_MAJOR_VERSION'] >= '15':
+    if not CONFIG['HOST_MAJOR_VERSION']:
         DEFINES.update(
             HAS_CONNECTX=True,
         )
+    elif CONFIG['HOST_MAJOR_VERSION'] >= '15':
+        DEFINES.update(
+            HAS_CONNECTX=True,
+        )