diff --git a/alloy.py b/alloy.py index f5f45292..331ec34f 100755 --- a/alloy.py +++ b/alloy.py @@ -438,6 +438,7 @@ def validation_run(only, only_targets, reference_branch, number, notify, update, LLVM = [] targets = [] sde_targets = [] + # parsing option only, update parameters of run if "-O2" in only: opts.append(False) @@ -518,6 +519,14 @@ def validation_run(only, only_targets, reference_branch, number, notify, update, for j in range(0,len(targets)): stability.target = targets[j] stability.wrapexe = "" + # choosing right compiler for a given target + # sometimes clang++ is not avaluable. if --ispc-build-compiler = gcc we will pass in g++ compiler + if options.ispc_build_compiler == "gcc": + stability.compiler_exe = "g++" + # but 'knc' target is supported only by icpc, so set explicitly + if "knc" in targets[j]: + stability.compiler_exe = "icpc" + # now set archs for targets if "generic" in targets[j]: arch = gen_archs elif "knc" in targets[j]: diff --git a/run_tests.py b/run_tests.py index be8f78b6..eb39b188 100755 --- a/run_tests.py +++ b/run_tests.py @@ -592,7 +592,6 @@ def run_tests(options1, args, print_version): options.compiler_exe = "cl.exe" else: options.compiler_exe = "clang++" - # checks the required compiler otherwise prints an error message PATH_dir = string.split(os.getenv("PATH"), os.pathsep)