Use vars for libclc target names

Author: jchlanda

buildbot/configure.py

@@ -15,6 +15,9 @@ def do_configure(args):
 
     llvm_external_projects = 'sycl;llvm-spirv;opencl;libdevice;xpti;xptifw'
 
+    libclc_amd_target_names = ';amdgcn--;amdgcn--amdhsa'
+    libclc_nvidia_target_names = 'nvptx64--;nvptx64--nvidiacl'
+
     if args.llvm_external_projects:
         llvm_external_projects += ";" + args.llvm_external_projects.replace(",", ";")
 
@@ -55,22 +58,22 @@ def do_configure(args):
 
     if args.cuda:
         llvm_targets_to_build += ';NVPTX'
-        libclc_targets_to_build = 'nvptx64--;nvptx64--nvidiacl'
+        libclc_targets_to_build = libclc_nvidia_target_names
         libclc_gen_remangled_variants = 'ON'
         sycl_build_pi_cuda = 'ON'
 
     if args.hip:
         if args.hip_platform == 'AMD':
             llvm_targets_to_build += ';AMDGPU'
-            libclc_targets_to_build += ';amdgcn--;amdgcn--amdhsa'
+            libclc_targets_to_build += libclc_amd_target_names
             if args.hip_amd_arch:
                 sycl_clang_extra_flags += "-Xsycl-target-backend=amdgcn-amd-amdhsa --offload-arch="+args.hip_amd_arch
 
             # The HIP plugin for AMD uses lld for linking
             llvm_enable_projects += ';lld'
         elif args.hip_platform == 'NVIDIA' and not args.cuda:
             llvm_targets_to_build += ';NVPTX'
-            libclc_targets_to_build += ';nvptx64--;nvptx64--nvidiacl'
+            libclc_targets_to_build += libclc_nvidia_target_names
         libclc_gen_remangled_variants = 'ON'
 
         sycl_build_pi_hip_platform = args.hip_platform
@@ -109,10 +112,10 @@ def do_configure(args):
         if 'NVPTX' not in llvm_targets_to_build:
             llvm_targets_to_build += ';NVPTX'
         # Add both NVIDIA and AMD libclc targets
-        if 'amdgcn--;amdgcn--amdhsa' not in libclc_targets_to_build:
-            libclc_targets_to_build += ';amdgcn--;amdgcn--amdhsa'
-        if 'nvptx64--;nvptx64--nvidiacl' not in libclc_targets_to_build:
-            libclc_targets_to_build += ';nvptx64--;nvptx64--nvidiacl'
+        if libclc_amd_target_names not in libclc_targets_to_build:
+            libclc_targets_to_build += libclc_amd_target_names
+        if libclc_nvidia_target_names not in libclc_targets_to_build:
+            libclc_targets_to_build += libclc_nvidia_target_names
 
     install_dir = os.path.join(abs_obj_dir, "install")