From d2b234e5d3a4d734e451979059b737404b0521a7 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Wed, 9 Mar 2016 15:52:03 -0700 Subject: [PATCH] Pass *_LICENSE_FILE to gcc in msgxx-glibc test This can fix a failure to pick up the needed argument for our flags. Signed-off-by: Christopher Larson --- conf/distro/include/tcmode-external-sourcery.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/conf/distro/include/tcmode-external-sourcery.inc b/conf/distro/include/tcmode-external-sourcery.inc index 756807f..0e19286 100644 --- a/conf/distro/include/tcmode-external-sourcery.inc +++ b/conf/distro/include/tcmode-external-sourcery.inc @@ -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: