diff options
| author | Joseph Huber <jhuber6@vols.utk.edu> | 2022-03-28 12:23:21 -0400 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2022-05-19 16:12:56 -0700 |
| commit | 76c1c1dd2a01fa2b2511cd0da3ec71d03addb107 (patch) | |
| tree | 86631413b004f4b511c59ad99fd7923555f53fbe | |
| parent | 588b95a2b88ef36b6ac294032ef24cda70c1cf44 (diff) | |
| download | llvm-76c1c1dd2a01fa2b2511cd0da3ec71d03addb107.tar.gz | |
[OpenMP] Fix library path missing when using OpenMP
The changes in D122444 caused OpenMP programs built with the
LLVM_ENABLE_RUNTIMES options to stop finding the libraries. We generally
expect to link against the libraries associated with the clang
installation itself but we no longer implicitly included that directory.
This patch adds in the include path of the clang installations library
to ensure we can find them.
Reviewed By: jdoerfert, MaskRay
Differential Revision: https://reviews.llvm.org/D122592
(cherry picked from commit fceea4e11028f4bfbafbd6893ddeb319420107d9)
| -rw-r--r-- | clang/lib/Driver/ToolChains/CommonArgs.cpp | 12 | ||||
| -rw-r--r-- | clang/lib/Driver/ToolChains/CommonArgs.h | 3 | ||||
| -rw-r--r-- | clang/test/Driver/openmp-library-path.c | 5 |
3 files changed, 20 insertions, 0 deletions
diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp index dfcef2304040..8f9244cae8db 100644 --- a/clang/lib/Driver/ToolChains/CommonArgs.cpp +++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp @@ -661,6 +661,17 @@ void tools::addOpenMPRuntimeSpecificRPath(const ToolChain &TC, } } +void tools::addOpenMPRuntimeLibraryPath(const ToolChain &TC, + const ArgList &Args, + ArgStringList &CmdArgs) { + // Default to clang lib / lib64 folder, i.e. the same location as device + // runtime. + SmallString<256> DefaultLibPath = + llvm::sys::path::parent_path(TC.getDriver().Dir); + llvm::sys::path::append(DefaultLibPath, Twine("lib") + CLANG_LIBDIR_SUFFIX); + CmdArgs.push_back(Args.MakeArgString("-L" + DefaultLibPath)); +} + void tools::addArchSpecificRPath(const ToolChain &TC, const ArgList &Args, ArgStringList &CmdArgs) { // Enable -frtlib-add-rpath by default for the case of VE. @@ -720,6 +731,7 @@ bool tools::addOpenMPRuntime(ArgStringList &CmdArgs, const ToolChain &TC, if (RTKind == Driver::OMPRT_OMP) addOpenMPRuntimeSpecificRPath(TC, Args, CmdArgs); + addOpenMPRuntimeLibraryPath(TC, Args, CmdArgs); return true; } diff --git a/clang/lib/Driver/ToolChains/CommonArgs.h b/clang/lib/Driver/ToolChains/CommonArgs.h index 23012dc247e4..2bba1ee285e6 100644 --- a/clang/lib/Driver/ToolChains/CommonArgs.h +++ b/clang/lib/Driver/ToolChains/CommonArgs.h @@ -111,6 +111,9 @@ void addOpenMPRuntimeSpecificRPath(const ToolChain &TC, llvm::opt::ArgStringList &CmdArgs); void addArchSpecificRPath(const ToolChain &TC, const llvm::opt::ArgList &Args, llvm::opt::ArgStringList &CmdArgs); +void addOpenMPRuntimeLibraryPath(const ToolChain &TC, + const llvm::opt::ArgList &Args, + llvm::opt::ArgStringList &CmdArgs); /// Returns true, if an OpenMP runtime has been added. bool addOpenMPRuntime(llvm::opt::ArgStringList &CmdArgs, const ToolChain &TC, const llvm::opt::ArgList &Args, diff --git a/clang/test/Driver/openmp-library-path.c b/clang/test/Driver/openmp-library-path.c new file mode 100644 index 000000000000..e7aad339ced4 --- /dev/null +++ b/clang/test/Driver/openmp-library-path.c @@ -0,0 +1,5 @@ +// RUN: %clang -### -fopenmp=libomp --target=x86_64-linux-gnu -ccc-install-dir %S/Inputs/basic_linux_tree/usr/bin %s 2>&1 | FileCheck %s + +void foo() {} + +// CHECK: -L{{.*}}Inputs{{.*}}basic_linux_tree |