diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-12 11:28:42 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-12-12 11:28:42 -0800 |
| commit | af2a3b54aa520b778562eb3a347ec1cf027c0859 (patch) | |
| tree | ed97819282b8d479154b315a9885b9843c9b0332 /scripts/toolchains | |
| parent | 666cc9cee23c11ade0471a59a52afc3f7f8754c0 (diff) | |
| parent | 1d5e22919fcfeba3fe513248e73395c42ac18ae4 (diff) | |
| download | vcpkg-af2a3b54aa520b778562eb3a347ec1cf027c0859.tar.gz vcpkg-af2a3b54aa520b778562eb3a347ec1cf027c0859.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4958
Diffstat (limited to 'scripts/toolchains')
| -rw-r--r-- | scripts/toolchains/linux.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/toolchains/linux.cmake b/scripts/toolchains/linux.cmake index 6bfb57621..b9cbc0ff3 100644 --- a/scripts/toolchains/linux.cmake +++ b/scripts/toolchains/linux.cmake @@ -16,5 +16,9 @@ if(NOT _CMAKE_IN_TRY_COMPILE) string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
+ if(VCPKG_CRT_LINKAGE STREQUAL "static")
+ string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT "-static ")
+ string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT "-static ")
+ endif()
endif()
endif()
|