Commit ef8e23bf authored by Chris Manchester's avatar Chris Manchester Committed by Frank-Rainer Grahl
Browse files

Bug 1521463 - Show rustc info in about:buildconfig r=firefox-build-system-reviewers,mshal

Differential Revision: https://phabricator.services.mozilla.com/D17305
parent c35921ad
......@@ -29,6 +29,7 @@ def rustc_info(rustc):
host=info['host'],
)
set_config('RUSTC_VERSION', depends(rustc_info)(lambda info: str(info.version)))
@depends_if(cargo)
@checking('cargo version', lambda info: info.version)
......
......@@ -52,6 +52,11 @@
<td>@CC_VERSION@</td>
<td>@CXXFLAGS@</td>
</tr>
<tr>
<td>@RUSTC@</td>
<td>@RUSTC_VERSION@</td>
<td>@RUSTFLAGS@</td>
</tr>
</tbody>
</table>
<h2>Configure options</h2>
......
......@@ -6,11 +6,17 @@
TEST_DIRS += ['tests']
for var in ('target', 'MOZ_CONFIGURE_OPTIONS', 'CC', 'CC_VERSION', 'CXX'):
for var in ('target', 'MOZ_CONFIGURE_OPTIONS', 'CC', 'CC_VERSION', 'CXX',
'RUSTC', 'RUSTC_VERSION'):
DEFINES[var] = CONFIG[var]
DEFINES['CFLAGS'] = ' '.join(CONFIG['OS_CFLAGS'])
rustflags = CONFIG['RUSTFLAGS']
if not rustflags:
rustflags = []
DEFINES['RUSTFLAGS'] = ' '.join(rustflags)
cxx_flags = []
for var in ('OS_CPPFLAGS', 'OS_CXXFLAGS', 'DEBUG', 'OPTIMIZE', 'FRAMEPTR'):
cxx_flags += COMPILE_FLAGS.get(var, [])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment