diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-01-20 11:41:47 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-01-20 11:41:47 -0500 |
| commit | 3dafd81173f492938c0083b20fe8e3f6362b4866 (patch) | |
| tree | d10188e22c7154fee86b7c5dea7dd4768b073e3d | |
| parent | 154ed186eab7f6e57601cf7e08c927f3a860a9d8 (diff) | |
PATH-180, BUILDFIX removing extraneous FORCE:MULTIPLE to fix the linux build.
| -rw-r--r-- | indra/cmake/00-Common.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 9db0f4fff8..98eeed09b3 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -180,7 +180,7 @@ if (LINUX) # this stops us requiring a really recent glibc at runtime add_definitions(-fno-stack-protector) # linking can be very memory-hungry, especially the final viewer link - set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory,FORCE:MULTIPLE") + set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory") endif (NOT STANDALONE) endif (VIEWER) |