2 files changed, 17 insertions, 3 deletions
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt
index 0ea6495eac..c3752a4705 100644
--- a/indra/llplugin/slplugin/CMakeLists.txt
+++ b/indra/llplugin/slplugin/CMakeLists.txt
@@ -60,6 +60,20 @@ if (DARWIN)
   )
 endif (DARWIN)
 
+if (BUILD_SHARED_LIBS)
+  set_target_properties(SLPlugin PROPERTIES LINK_FLAGS_RELEASE
+    "${LINK_FLAGS_RELEASE} -Wl,--allow-shlib-undefined")
+endif ()
+
+if (INSTALL)
+  if (DARWIN)
+    install(TARGETS ${PROJECT_NAME}
+      DESTINATION ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources)
+  else (DARWIN)
+    install(TARGETS ${PROJECT_NAME} DESTINATION libexec/${VIEWER_BINARY_NAME})
+  endif (DARWIN)
+endif (INSTALL)
+
 if (LL_TESTS)
   ll_deploy_sharedlibs_command(SLPlugin)
 endif (LL_TESTS)
diff --git a/indra/llplugin/slplugin/slplugin.cpp b/indra/llplugin/slplugin/slplugin.cpp
index f2925a1fa1..d20e01c231 100644
--- a/indra/llplugin/slplugin/slplugin.cpp
+++ b/indra/llplugin/slplugin/slplugin.cpp
@@ -46,7 +46,7 @@ using namespace std;
     #include "slplugin-objc.h"
 #endif
 
-#if LL_DARWIN || LL_LINUX
+#if LL_DARWIN || LL_LINUX || __FreeBSD__
     #include <signal.h>
 #endif
 
@@ -64,7 +64,7 @@ using namespace std;
     Now that SLPlugin is a bundled app on the Mac, this is no longer necessary (it can just use a regular Info.plist file), but I'm leaving this comment in for posterity.
 */
 
-#if LL_DARWIN || LL_LINUX
+#if LL_DARWIN || LL_LINUX || __FreeBSD__
 // Signal handlers to make crashes not show an OS dialog...
 static void crash_handler(int sig)
 {
@@ -182,7 +182,7 @@ int main(int argc, char **argv)
     // display a crash message if something bad happens. The host app will
     // see the missing heartbeat and log appropriately.
     initExceptionHandler();
-#elif LL_DARWIN || LL_LINUX
+#elif LL_DARWIN || LL_LINUX || __FreeBSD__
     if(argc < 2)
     {
         LL_ERRS("slplugin") << "usage: " << argv[0] << " launcher_port" << LL_ENDL;