1*4882a593SmuzhiyunFrom c347aeb43775109cbc2824b99cb10b1b3440c191 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3*4882a593SmuzhiyunDate: Mon, 17 May 2021 21:27:11 +0200 4*4882a593SmuzhiyunSubject: [PATCH] server/CMakeLists.txt: don't override CMAKE_EXE_LINKER_FLAGS 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunDon't override CMAKE_EXE_LINKER_FLAGS as this could break the build if 7*4882a593SmuzhiyunCMAKE_EXE_LINKER_FLAGS is already set by the user (for example to pass 8*4882a593Smuzhiyun-latomic) 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 11*4882a593Smuzhiyun[Upstream status: https://github.com/cutelyst/cutelyst/pull/312] 12*4882a593Smuzhiyun--- 13*4882a593Smuzhiyun wsgi/CMakeLists.txt | 2 +- 14*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 1 deletion(-) 15*4882a593Smuzhiyun 16*4882a593Smuzhiyundiff --git a/server/CMakeLists.txt b/server/CMakeLists.txt 17*4882a593Smuzhiyunindex ec5689f7..1ed56859 100644 18*4882a593Smuzhiyun--- a/wsgi/CMakeLists.txt 19*4882a593Smuzhiyun+++ b/wsgi/CMakeLists.txt 20*4882a593Smuzhiyun@@ -95,7 +95,7 @@ install(TARGETS Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}Server 21*4882a593Smuzhiyun cxx_generalized_initializers 22*4882a593Smuzhiyun ) 23*4882a593Smuzhiyun if (JEMALLOC_FOUND) 24*4882a593Smuzhiyun- set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} " -Wl,--no-as-needed") 25*4882a593Smuzhiyun+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed") 26*4882a593Smuzhiyun target_link_libraries(cutelyst-wsgi2 PRIVATE ${JEMALLOC_LIBRARIES}) 27*4882a593Smuzhiyun endif() 28*4882a593Smuzhiyun 29*4882a593Smuzhiyun-- 30*4882a593Smuzhiyun2.30.2 31*4882a593Smuzhiyun 32