From 970221a7aaa211cf26ac9f0a4362a21447db622c Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Thu, 30 Sep 2010 02:39:58 +0200
Subject: VWR-14426: Link step fails on Linux when LDFLAGS is set

See http://redmine.imprudenceviewer.org/issues/572
---
 linden/doc/contributions.txt                   | 1 +
 linden/indra/linux_crash_logger/CMakeLists.txt | 2 +-
 linden/indra/newview/CMakeLists.txt            | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'linden')

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index c7e3794..c1c3ec3 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -43,6 +43,7 @@ Aleric Inglewood
 	VWR-10759
 	VWR-10837
 	VWR-13996
+	VWR-14426
 	SNOW-84
 	SNOW-86
 	SNOW-103
diff --git a/linden/indra/linux_crash_logger/CMakeLists.txt b/linden/indra/linux_crash_logger/CMakeLists.txt
index 6f6754e..4b19e28 100644
--- a/linden/indra/linux_crash_logger/CMakeLists.txt
+++ b/linden/indra/linux_crash_logger/CMakeLists.txt
@@ -38,7 +38,7 @@ list(APPEND linux_crash_logger_SOURCE_FILES
      ${linux_crash_logger_HEADER_FILES}
      )
 
-list(APPEND CMAKE_EXE_LINKER_FLAGS -Wl,--as-needed)
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
 
 add_executable(linux-crash-logger ${linux_crash_logger_SOURCE_FILES})
 
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 1816ff9..f762923 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -993,7 +993,7 @@ endif (DARWIN)
 
 if (LINUX)
     LIST(APPEND viewer_SOURCE_FILES llappviewerlinux.cpp)
-    LIST(APPEND CMAKE_EXE_LINKER_FLAGS -Wl,--as-needed)
+    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
 
     set(viewer_LIBRARIES
         Xinerama
-- 
cgit v1.1