aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merged in the gcc_compile branch

Browse Source
This commit is contained in:
Anton Mitrokhin
2014-07-20 13:32:24 +04:00
parent 09ec2db6e9 7c3a2435b3
commit 74160e3737
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
alloy.py
View File

@@ -438,6 +438,7 @@ def validation_run(only, only_targets, reference_branch, number, notify, update,
LLVM = [] LLVM = []
targets = [] targets = []
sde_targets = [] sde_targets = []
# parsing option only, update parameters of run # parsing option only, update parameters of run
if "-O2" in only: if "-O2" in only:
opts.append(False) 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)): for j in range(0,len(targets)):
stability.target = targets[j] stability.target = targets[j]
stability.wrapexe = "" 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]: if "generic" in targets[j]:
arch = gen_archs arch = gen_archs
elif "knc" in targets[j]: elif "knc" in targets[j]:

1
run_tests.py
View File

@@ -592,7 +592,6 @@ def run_tests(options1, args, print_version):
options.compiler_exe = "cl.exe" options.compiler_exe = "cl.exe"
else: else:
options.compiler_exe = "clang++" options.compiler_exe = "clang++"
# checks the required compiler otherwise prints an error message # checks the required compiler otherwise prints an error message
PATH_dir = string.split(os.getenv("PATH"), os.pathsep) PATH_dir = string.split(os.getenv("PATH"), os.pathsep)