From 6704e9e81a92bfb2a459674edb4c903ee74ecd48 Mon Sep 17 00:00:00 2001 From: "Hammond, Jeff R" Date: Mon, 19 Oct 2020 10:19:15 -0700 Subject: [PATCH] reorder ARM and CUDA arg parsing ARM replaces x86 whereas CUDA appends, so the ARM part needs to come first for llvm_targets_to_build to be populated correctly. Signed-off-by: Hammond, Jeff R --- buildbot/configure.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/buildbot/configure.py b/buildbot/configure.py index e23bb92f0a300..1e7781c4c6df3 100644 --- a/buildbot/configure.py +++ b/buildbot/configure.py @@ -32,16 +32,16 @@ def do_configure(args): icd_loader_lib = os.path.join(icd_loader_lib, "libOpenCL.so" if platform.system() == 'Linux' else "OpenCL.lib") + # replace not append, so ARM ^ X86 + if args.arm: + llvm_targets_to_build = 'ARM;AArch64' + if args.cuda: llvm_targets_to_build += ';NVPTX' llvm_enable_projects += ';libclc' libclc_targets_to_build = 'nvptx64--;nvptx64--nvidiacl' sycl_build_pi_cuda = 'ON' - # replace not append, so ARM ^ X86 - if args.arm: - llvm_targets_to_build = 'ARM;AArch64' - if args.no_werror: sycl_werror = 'OFF'