Bug 1532899 - Mask `Build tools` section from about:buildconfig when all it can display is "None". r=froydnj
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 06 Mar 2019 14:08:27 +0000
changeset 520943 289a463d4dedadaa43e72903b726568a13c944b9
parent 520942 3fd4a7b0872e76f8396355a1811676dcfbd86a79
child 520944 c8d9a73cf366b9cd50c40e63a80300b76256b2f2
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1532899
milestone67.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 1532899 - Mask `Build tools` section from about:buildconfig when all it can display is "None". r=froydnj Differential Revision: https://phabricator.services.mozilla.com/D22261
toolkit/content/buildconfig.html
toolkit/content/moz.build
--- a/toolkit/content/buildconfig.html
+++ b/toolkit/content/buildconfig.html
@@ -26,16 +26,17 @@
     <tr>
       <th>target</th>
     </tr>
     <tr>
       <td>@target@</td>
     </tr>
   </tbody>
 </table>
+#if defined(CC) && defined(CXX) && defined(RUSTC)
 <h2>Build tools</h2>
 <table>
   <tbody>
     <tr>
       <th>Compiler</th>
       <th>Version</th>
       <th>Compiler flags</th>
     </tr>
@@ -51,16 +52,17 @@
     </tr>
     <tr>
       <td>@RUSTC@</td>
       <td>@RUSTC_VERSION@</td>
       <td>@RUSTFLAGS@</td>
     </tr>
   </tbody>
 </table>
+#endif
 <h2>Configure options</h2>
 <p>@MOZ_CONFIGURE_OPTIONS@</p>
 #ifdef ANDROID
 <h2>Package name</h2>
 <p>@ANDROID_PACKAGE_NAME@</p>
 #endif
 </body>
 </html>
--- a/toolkit/content/moz.build
+++ b/toolkit/content/moz.build
@@ -1,18 +1,21 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['tests']
 
-for var in ('target', 'MOZ_CONFIGURE_OPTIONS', 'CC', 'CC_VERSION', 'CXX',
-            'RUSTC', 'RUSTC_VERSION'):
+for var in ('CC', 'CC_VERSION', 'CXX', 'RUSTC', 'RUSTC_VERSION'):
+    if CONFIG[var]:
+        DEFINES[var] = CONFIG[var]
+
+for var in ('target', 'MOZ_CONFIGURE_OPTIONS'):
     DEFINES[var] = CONFIG[var]
 
 DEFINES['CFLAGS'] = ' '.join(CONFIG['OS_CFLAGS'])
 
 rustflags = CONFIG['RUSTFLAGS']
 if not rustflags:
     rustflags = []
 DEFINES['RUSTFLAGS'] = ' '.join(rustflags)