diff options
| author | Aleric Inglewood | 2010-09-30 02:39:58 +0200 |
|---|---|---|
| committer | Aleric Inglewood | 2010-09-30 02:39:58 +0200 |
| commit | c6743de7831a1c4705831d2f43b2cc363646d657 (patch) | |
| tree | cf98677f75e97a0486907a0190c9ecbacf955491 /linden/indra | |
| parent | SNOW-86: Dangerous macro leads to possible wrong code (diff) | |
| download | meta-impy-c6743de7831a1c4705831d2f43b2cc363646d657.zip meta-impy-c6743de7831a1c4705831d2f43b2cc363646d657.tar.gz meta-impy-c6743de7831a1c4705831d2f43b2cc363646d657.tar.bz2 meta-impy-c6743de7831a1c4705831d2f43b2cc363646d657.tar.xz | |
VWR-14426: Link step fails on Linux when LDFLAGS is set
See http://redmine.imprudenceviewer.org/issues/572
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/linux_crash_logger/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | linden/indra/newview/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
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 | |||
| 38 | ${linux_crash_logger_HEADER_FILES} | 38 | ${linux_crash_logger_HEADER_FILES} |
| 39 | ) | 39 | ) |
| 40 | 40 | ||
| 41 | list(APPEND CMAKE_EXE_LINKER_FLAGS -Wl,--as-needed) | 41 | set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed") |
| 42 | 42 | ||
| 43 | add_executable(linux-crash-logger ${linux_crash_logger_SOURCE_FILES}) | 43 | add_executable(linux-crash-logger ${linux_crash_logger_SOURCE_FILES}) |
| 44 | 44 | ||
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index 901cfeb..dc0cf69 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt | |||
| @@ -992,7 +992,7 @@ endif (DARWIN) | |||
| 992 | 992 | ||
| 993 | if (LINUX) | 993 | if (LINUX) |
| 994 | LIST(APPEND viewer_SOURCE_FILES llappviewerlinux.cpp) | 994 | LIST(APPEND viewer_SOURCE_FILES llappviewerlinux.cpp) |
| 995 | LIST(APPEND CMAKE_EXE_LINKER_FLAGS -Wl,--as-needed) | 995 | SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed") |
| 996 | 996 | ||
| 997 | set(viewer_LIBRARIES | 997 | set(viewer_LIBRARIES |
| 998 | Xinerama | 998 | Xinerama |