diff options
-rw-r--r-- | llvm/test/tools/llvm-config/libs.test | 2 | ||||
-rw-r--r-- | llvm/tools/llvm-config/llvm-config.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/llvm/test/tools/llvm-config/libs.test b/llvm/test/tools/llvm-config/libs.test index 39b8834e246..25efa8ce7c0 100644 --- a/llvm/test/tools/llvm-config/libs.test +++ b/llvm/test/tools/llvm-config/libs.test @@ -1,4 +1,4 @@ -RUN: llvm-config --libs core support 2>&1 | FileCheck %s +RUN: llvm-config --ignore-libllvm --libs core support 2>&1 | FileCheck %s CHECK: LLVMCore CHECK: LLVMSupport CHECK-NOT: error diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp index 4b4a3ea97ab..6fdc304dbf1 100644 --- a/llvm/tools/llvm-config/llvm-config.cpp +++ b/llvm/tools/llvm-config/llvm-config.cpp @@ -215,6 +215,7 @@ Options:\n\ --shared-mode Print how the provided components can be collectively linked (`shared` or `static`).\n\ --link-shared Link the components as shared libraries.\n\ --link-static Link the component libraries statically.\n\ + --ignore-libllvm Ignore libLLVM and link component libraries instead.\n\ Typical components:\n\ all All LLVM libraries (default).\n\ engine Either a native JIT or a bitcode interpreter.\n"; @@ -553,6 +554,8 @@ int main(int argc, char **argv) { LinkMode = LinkModeShared; } else if (Arg == "--link-static") { LinkMode = LinkModeStatic; + } else if (Arg == "--ignore-libllvm") { + LinkDyLib = false; } else { usage(); } |