[Openmp-commits] [openmp] d3748d9 - [Libomptarget] Fix test logic for optionally adding the libcgpu.a

[Joseph Huber via Openmp-commits]

Author: Joseph Huber
Date: 2023-07-07T12:49:50-05:00
New Revision: d3748d942aeee10fc7bcc7d469f5d0388222edff

URL: https://github.com/llvm/llvm-project/commit/d3748d942aeee10fc7bcc7d469f5d0388222edff
DIFF: https://github.com/llvm/llvm-project/commit/d3748d942aeee10fc7bcc7d469f5d0388222edff.diff

LOG: [Libomptarget] Fix test logic for optionally adding the libcgpu.a

Summary:
This was not operating as expected and was causing the build to fail on
non-configured systems.

Added: 
    

Modified: 
    openmp/libomptarget/test/lit.cfg

Removed: 
    


################################################################################
diff  --git a/openmp/libomptarget/test/lit.cfg b/openmp/libomptarget/test/lit.cfg
index 4dabca41c0bcaf..2bb48b16d51a29 100644
--- a/openmp/libomptarget/test/lit.cfg
+++ b/openmp/libomptarget/test/lit.cfg
@@ -216,12 +216,12 @@ for libomptarget_target in config.libomptarget_all_targets:
             "%libomptarget-run-" + libomptarget_target))
         config.substitutions.append(("%libomptarget-compilexx-" + \
             libomptarget_target, \
-            "%clangxx-" + libomptarget_target + " %s -o %t" \
-            " -lcgpu" if config.libomptarget_has_libc else ""))
+            "%clangxx-" + libomptarget_target + " %s -o %t" + \
+            (" -lcgpu" if config.libomptarget_has_libc else "")))
         config.substitutions.append(("%libomptarget-compile-" + \
             libomptarget_target, \
-            "%clang-" + libomptarget_target + " %s -o %t"
-            " -lcgpu" if config.libomptarget_has_libc else ""))
+            "%clang-" + libomptarget_target + " %s -o %t" +
+            (" -lcgpu" if config.libomptarget_has_libc else "")))
         config.substitutions.append(("%libomptarget-compileoptxx-run-and-check-" + \
             libomptarget_target, \
             "%libomptarget-compileoptxx-and-run-" + libomptarget_target + \
@@ -240,12 +240,12 @@ for libomptarget_target in config.libomptarget_all_targets:
             "%libomptarget-run-" + libomptarget_target))
         config.substitutions.append(("%libomptarget-compileoptxx-" + \
             libomptarget_target, \
-            "%clangxx-" + libomptarget_target + " -O3 %s -o %t"
-            " -lcgpu" if config.libomptarget_has_libc else ""))
+            "%clangxx-" + libomptarget_target + " -O3 %s -o %t" +
+            (" -lcgpu" if config.libomptarget_has_libc else "")))
         config.substitutions.append(("%libomptarget-compileopt-" + \
             libomptarget_target, \
-            "%clang-" + libomptarget_target + " -O3 %s -o %t"
-            " -lcgpu" if config.libomptarget_has_libc else ""))
+            "%clang-" + libomptarget_target + " -O3 %s -o %t" +
+            (" -lcgpu" if config.libomptarget_has_libc else "")))
         config.substitutions.append(("%libomptarget-run-" + \
             libomptarget_target, \
             "%t"))