diff options
| -rw-r--r-- | llvm/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | llvm/cmake/modules/HandleLLVMStdlib.cmake | 20 | ||||
| -rw-r--r-- | llvm/docs/CMake.rst | 5 |
3 files changed, 26 insertions, 0 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 44a269292fa..678f1a74bdd 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -390,6 +390,7 @@ else() option(LLVM_ENABLE_LOCAL_SUBMODULE_VISIBILITY "Compile with -fmodules-local-submodule-visibility." ON) endif() option(LLVM_ENABLE_LIBCXX "Use libc++ if available." OFF) +option(LLVM_STATIC_LINK_CXX_STDLIB "Statically link the standard library." OFF) option(LLVM_ENABLE_LLD "Use lld as C and C++ linker." OFF) option(LLVM_ENABLE_PEDANTIC "Compile with pedantic enabled." ON) option(LLVM_ENABLE_WERROR "Fail and stop if a warning is triggered." OFF) diff --git a/llvm/cmake/modules/HandleLLVMStdlib.cmake b/llvm/cmake/modules/HandleLLVMStdlib.cmake index f0e22d1a5b3..b67d87d4300 100644 --- a/llvm/cmake/modules/HandleLLVMStdlib.cmake +++ b/llvm/cmake/modules/HandleLLVMStdlib.cmake @@ -31,4 +31,24 @@ if(NOT DEFINED LLVM_STDLIB_HANDLED) message(WARNING "Not sure how to specify libc++ for this compiler") endif() endif() + + if(LLVM_STATIC_LINK_CXX_STDLIB) + if(LLVM_COMPILER_IS_GCC_COMPATIBLE) + check_cxx_compiler_flag("-static-libstdc++" + CXX_COMPILER_SUPPORTS_STATIC_STDLIB) + check_linker_flag("-static-libstdc++" CXX_LINKER_SUPPORTS_STATIC_STDLIB) + if(CXX_COMPILER_SUPPORTS_STATIC_STDLIB AND + CXX_LINKER_SUPPORTS_STATIC_STDLIB) + append("-static-libstdc++" + CMAKE_EXE_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS + CMAKE_MODULE_LINKER_FLAGS) + else() + message(WARNING + "Can't specify static linking for the C++ standard library") + endif() + else() + message(WARNING "Not sure how to specify static linking of C++ standard " + "library for this compiler") + endif() + endif() endif() diff --git a/llvm/docs/CMake.rst b/llvm/docs/CMake.rst index cbddad5746d..2c54fde4393 100644 --- a/llvm/docs/CMake.rst +++ b/llvm/docs/CMake.rst @@ -431,6 +431,11 @@ LLVM-specific variables passed to invocations of both so that the project is built using libc++ instead of stdlibc++. Defaults to OFF. +**LLVM_STATIC_LINK_CXX_STDLIB**:BOOL + Statically link to the C++ standard library if possible. This uses the flag + "-static-libstdc++", but a Clang host compiler will statically link to libc++ + if used in conjuction with the **LLVM_ENABLE_LIBCXX** flag. Defaults to OFF. + **LLVM_ENABLE_LLD**:BOOL This option is equivalent to `-DLLVM_USE_LINKER=lld`, except during a 2-stage build where a dependency is added from the first stage to the second ensuring |
