Skip to content

Commit

Permalink
Bug 1532899 - Mask Build tools section from about:buildconfig when …
Browse files Browse the repository at this point in the history
…all it can display is "None". r=froydnj

Differential Revision: https://phabricator.services.mozilla.com/D22261

--HG--
extra : moz-landing-system : lando
  • Loading branch information
glandium committed Mar 6, 2019
1 parent eea10fc commit 8c04bb8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 2 additions & 0 deletions toolkit/content/buildconfig.html
Expand Up @@ -31,6 +31,7 @@ <h2>Build platform</h2>
</tr>
</tbody>
</table>
#if defined(CC) && defined(CXX) && defined(RUSTC)
<h2>Build tools</h2>
<table>
<tbody>
Expand All @@ -56,6 +57,7 @@ <h2>Build tools</h2>
</tr>
</tbody>
</table>
#endif
<h2>Configure options</h2>
<p>@MOZ_CONFIGURE_OPTIONS@</p>
#ifdef ANDROID
Expand Down
7 changes: 5 additions & 2 deletions toolkit/content/moz.build
Expand Up @@ -6,8 +6,11 @@

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'])
Expand Down

0 comments on commit 8c04bb8

Please sign in to comment.