Merge pull request #124 from kergoth/pass-license-to-sgxx-glibc-test

Pass *_LICENSE_FILE to gcc in msgxx-glibc test
This commit is contained in:
Noor-Ahsan
2016-03-11 12:50:22 +05:00

View File

@@ -164,9 +164,14 @@ python toolchain_metadata_setup () {
# Determine if '-msgxx-glibc' is a valid toolchain option.
# If so then we need to use it to ensure that the libraries included with
# the toolchain are used rather than the build host native libraries.
testenv = os.environ.copy()
for var in ['MGLS_LICENSE_FILE', 'LM_LICENSE_FILE']:
if var in d:
testenv[var] = d.getVar(var, True)
with tempfile.NamedTemporaryFile(suffix='.c') as f:
try:
subprocess.check_output([d.expand('${EXTERNAL_TOOLCHAIN}/bin/${EXTERNAL_TARGET_SYS}-gcc'), '-msgxx-glibc', '-E', f.name], cwd=d.getVar('TOPDIR', True), stderr=subprocess.STDOUT)
subprocess.check_output([d.expand('${EXTERNAL_TOOLCHAIN}/bin/${EXTERNAL_TARGET_SYS}-gcc'), '-msgxx-glibc', '-E', f.name], stderr=subprocess.STDOUT, env=testenv, cwd=d.getVar('TOPDIR', True))
except (OSError, subprocess.CalledProcessError):
pass
else: