From 5aac012ea45de3e331309ba68d4110260254f6cd Mon Sep 17 00:00:00 2001 From: hsc Date: Tue, 25 Sep 2012 16:14:25 +0000 Subject: [PATCH] reverting r1671, it completely breaks linking everywhere FIXME: We really need to make linking less fragile. The campaign server should not (at the moment: cannot, and does not) link against the simulator backend, but the SAL instance refers to backend symbols. This just seems to work currently due to lucky translation unit arrangement and a lot of karma accumulated over the last few years. git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1693 8c4709b5-6ec9-48aa-a5cd-a96041d1645a --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 45e11beb..bbc85a11 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -37,4 +37,4 @@ set(experiment_libraries "") foreach(exp_or_plugin ${EXPERIMENTS_ACTIVATED} ${PLUGINS_ACTIVATED}) set(experiment_libraries ${experiment_libraries} fail-${exp_or_plugin}) endforeach(exp_or_plugin) -target_link_libraries(fail -Wl,-whole-archive ${experiment_libraries} fail-sal fail-cpn fail-efw fail-comm fail-util -Wl,-no-whole-archive) +target_link_libraries(fail -Wl,-start-group fail-sal fail-cpn fail-efw fail-comm fail-util ${experiment_libraries} -Wl,-end-group)