From 3aebde5df4b911aec518ecd4cc5c6dad328f5d86 Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Fri, 3 Jun 2011 14:15:13 -0700 Subject: [PATCH] icl12 build fix --- data/scons/icl12.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data/scons/icl12.py b/data/scons/icl12.py index b7e9ada8..2f5360f1 100644 --- a/data/scons/icl12.py +++ b/data/scons/icl12.py @@ -97,8 +97,10 @@ def generate(env): return if env['TARGET_ARCH'] == 'x86': arch = 'ia32' + arch_redist = 'ia32' elif env['TARGET_ARCH'] == 'x86_64' or env['TARGET_ARCH'] == 'amd64': arch = 'ia32_intel64' + arch_redist = 'intel64' else: raise Exception('Unknown architecture ' + env['TARGET_ARCH']) @@ -111,7 +113,7 @@ def generate(env): icpp_path = os.environ.get('ICPP_COMPOSER2011') 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), 'compiler') + env['REDIST_PATH'] = os.path.join(os.path.join(os.path.join(icpp_path, 'redist'), arch_redist), 'compiler') def exists(env): if 'INTEL_COMPILER' not in env or env['INTEL_COMPILER'] != True: