diff --git a/CMakeLists.txt b/CMakeLists.txt index 97328a16a4ae87fe1880894da49ee663999c6134..2fd9097d6ecfecacf8c84946c02767ae9ddf387d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,6 +123,10 @@ if (NOT APPLE) set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GLIBC_COMPATIBILITY_LINK_FLAGS} ${CXX11_ABI_FLAGS}") endif () +if (USE_STATIC_LIBRARIES) + set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -no-pie") +endif () + # -fuse-ld=gold - fix linkage for gcc-5.4, gcc-6.1 # See more in http://stackoverflow.com/questions/37603238/fsanitize-not-using-gold-linker-in-gcc-6-1 set (CMAKE_CXX_FLAGS_ASAN "${CMAKE_CXX_FLAGS_ASAN} -O3 -g -fsanitize=address -fno-omit-frame-pointer -fuse-ld=gold ${CXX11_ABI_FLAGS}") diff --git a/contrib/libpoco/Net/cmake/test_anl.cmake b/contrib/libpoco/Net/cmake/test_anl.cmake index 28cb8a8ad8ea4771da6972cc05116233551fbf8f..a1697d0db5c0b756ffd1db3ad74a4f64e333ae64 100644 --- a/contrib/libpoco/Net/cmake/test_anl.cmake +++ b/contrib/libpoco/Net/cmake/test_anl.cmake @@ -19,6 +19,8 @@ if (ANL_LIB) set (CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ANL_LIB}) endif () +set (CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}") + check_cxx_source_runs(" #include int main() {