diff options
| -rw-r--r-- | llvm/test/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | llvm/test/lit.cfg | 4 | ||||
| -rw-r--r-- | llvm/test/lit.site.cfg.in | 1 | ||||
| -rw-r--r-- | llvm/test/tools/llvm-config/system-libs.test | 3 | ||||
| -rw-r--r-- | llvm/test/tools/llvm-config/system-libs.windows.test | 3 | ||||
| -rw-r--r-- | llvm/tools/llvm-config/llvm-config.cpp | 8 |
6 files changed, 17 insertions, 5 deletions
diff --git a/llvm/test/CMakeLists.txt b/llvm/test/CMakeLists.txt index 3bef0209620..c1667049f80 100644 --- a/llvm/test/CMakeLists.txt +++ b/llvm/test/CMakeLists.txt @@ -7,7 +7,8 @@ llvm_canonicalize_cmake_booleans( HAVE_LIBZ HAVE_LIBXAR LLVM_ENABLE_DIA_SDK - LLVM_ENABLE_FFI) + LLVM_ENABLE_FFI + BUILD_SHARED_LIBS) configure_lit_site_cfg( ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in diff --git a/llvm/test/lit.cfg b/llvm/test/lit.cfg index f3b1d1c1ed2..e9916b2a60e 100644 --- a/llvm/test/lit.cfg +++ b/llvm/test/lit.cfg @@ -377,6 +377,10 @@ else: if loadable_module: config.available_features.add('loadable_module') +# Static libraries are not built if BUILD_SHARED_LIBS is ON. +if not config.build_shared_libs: + config.available_features.add("static-libs") + # Sanitizers. if 'Address' in config.llvm_use_sanitizer: config.available_features.add("asan") diff --git a/llvm/test/lit.site.cfg.in b/llvm/test/lit.site.cfg.in index 4bf1211eeff..b6a8b8b17bc 100644 --- a/llvm/test/lit.site.cfg.in +++ b/llvm/test/lit.site.cfg.in @@ -38,6 +38,7 @@ config.have_zlib = @HAVE_LIBZ@ config.have_libxar = @HAVE_LIBXAR@ config.have_dia_sdk = @LLVM_ENABLE_DIA_SDK@ config.enable_ffi = @LLVM_ENABLE_FFI@ +config.build_shared_libs = @BUILD_SHARED_LIBS@ # Support substitution of the tools_dir with user parameters. This is # used when we can't determine the tool dir at configuration time. diff --git a/llvm/test/tools/llvm-config/system-libs.test b/llvm/test/tools/llvm-config/system-libs.test index 6a1f3e39fa1..9105d242e04 100644 --- a/llvm/test/tools/llvm-config/system-libs.test +++ b/llvm/test/tools/llvm-config/system-libs.test @@ -1,4 +1,5 @@ -RUN: llvm-config --system-libs 2>&1 | FileCheck %s +RUN: llvm-config --link-static --system-libs 2>&1 | FileCheck %s +REQUIRES: static-libs UNSUPPORTED: system-windows CHECK: -l CHECK-NOT: error diff --git a/llvm/test/tools/llvm-config/system-libs.windows.test b/llvm/test/tools/llvm-config/system-libs.windows.test index cc976ea3406..2c6e03afa2d 100644 --- a/llvm/test/tools/llvm-config/system-libs.windows.test +++ b/llvm/test/tools/llvm-config/system-libs.windows.test @@ -1,4 +1,5 @@ -RUN: llvm-config --system-libs 2>&1 | FileCheck %s +RUN: llvm-config --link-static --system-libs 2>&1 | FileCheck %s +REQUIRES: static-libs REQUIRES: system-windows CHECK-NOT: -l CHECK: psapi.lib shell32.lib ole32.lib uuid.lib diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp index 58571cc59b7..e8afcbaaf48 100644 --- a/llvm/tools/llvm-config/llvm-config.cpp +++ b/llvm/tools/llvm-config/llvm-config.cpp @@ -698,8 +698,12 @@ int main(int argc, char **argv) { // Print SYSTEM_LIBS after --libs. // FIXME: Each LLVM component may have its dependent system libs. - if (PrintSystemLibs) - OS << LLVM_SYSTEM_LIBS << '\n'; + if (PrintSystemLibs) { + // Output system libraries only if linking against a static + // library (since the shared library links to all system libs + // already) + OS << (LinkMode == LinkModeStatic ? LLVM_SYSTEM_LIBS : "") << '\n'; + } } else if (!Components.empty()) { errs() << "llvm-config: error: components given, but unused\n\n"; usage(); |
