diff --git a/data/scons/icl12.py b/data/scons/icl12.py index 0e8e56c4..ff0a1076 100644 --- a/data/scons/icl12.py +++ b/data/scons/icl12.py @@ -113,8 +113,14 @@ def generate(env): if 'ICPP_COMPOSER2011' in os.environ: icpp_path = os.environ.get('ICPP_COMPOSER2011') - else: + elif 'ICPP_COMPILER12' in os.environ: + icpp_path = os.environ.get('ICPP_COMPILER12') + elif 'ICPP_COMPOSER2013' in os.environ: + icpp_path = os.environ.get('ICPP_COMPOSER2013') + elif 'ICPP_COMPILER13' in os.environ: icpp_path = os.environ.get('ICPP_COMPILER13') + else: + raise Exception('Could not find any of the ICCPP_* environment variables!') merge_script_vars(env, os.path.join(icpp_path, 'bin/iclvars.bat'), arch + ' ' + vsrelease) env['REDIST_PATH'] = os.path.join(os.path.join(os.path.join(icpp_path, 'redist'), arch_redist), 'compiler')