See if this fixes my linkage problems
authorTom Ritter <tom@mozilla.com>
Thu, 24 Aug 2017 13:04:12 -0500
changeset 1270831 5e57a50b1460a7a4c9106c61e119783be82f2448
parent 1270830 5d39d8383da6e2ad291db25f22f757dd2fa6fbb1
child 1270832 b071ce28bd41c72a205c98d1f676b3be49630e2f
push id215818
push usertritter@mozilla.com
push dateThu, 24 Aug 2017 18:04:44 +0000
treeherdertry@b071ce28bd41 [default view] [failures only]
milestone57.0a1
See if this fixes my linkage problems MozReview-Commit-ID: CvwIdvv6I1L
moz.configure
--- a/moz.configure
+++ b/moz.configure
@@ -265,18 +265,20 @@ set_config('BUILD_BACKENDS', build_backe
 option('--disable-gtest-in-build',
        help='Force disable building the gtest libxul during the build.',
        when='--enable-compile-environment')
 
 # Determine whether to build the gtest xul. This happens in automation
 # on Desktop platforms with the exception of Windows PGO, where linking
 # xul-gtest.dll takes too long.
 @depends('MOZ_PGO', build_project, target, 'MOZ_AUTOMATION', '--disable-gtest-in-build',
-         when='--enable-compile-environment')
-def build_gtest(pgo, build_project, target, automation, enabled):
+         enable_tests, when='--enable-compile-environment')
+def build_gtest(pgo, build_project, target, automation, enabled, enable_tests):
+    if not enable_tests:
+        return None
     if not enabled:
         return None
     if (automation and build_project == 'browser' and
         not (pgo and target.os == 'WINNT')):
         return True
 
 set_config('LINK_GTEST_DURING_COMPILE', build_gtest)