From d3748d942aeee10fc7bcc7d469f5d0388222edff Mon Sep 17 00:00:00 2001 From: Joseph Huber Date: Fri, 7 Jul 2023 12:49:09 -0500 Subject: [PATCH] [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. --- openmp/libomptarget/test/lit.cfg | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/openmp/libomptarget/test/lit.cfg b/openmp/libomptarget/test/lit.cfg index 4dabca41c0bc..2bb48b16d51a 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"))