Bug 830303 - Fix plugin-container LD_LIBRARY_PATH on BSD (regression from 753046) DONTBUILD r=cjones a=akeybl
authorLandry Breuil <landry@openbsd.org>
Mon, 14 Jan 2013 22:38:17 +0100
changeset 127144 2b7a1f678d49ba32654d0946a9b46658b51f1b1b
parent 127143 a8701a59e9fdac1fb6b5cab8dfc075e20e746853
child 127145 ca40e0e49a9d8b9bfdd0d6707c60944346493790
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscjones, akeybl
bugs830303, 753046
milestone20.0a2
Bug 830303 - Fix plugin-container LD_LIBRARY_PATH on BSD (regression from 753046) DONTBUILD r=cjones a=akeybl
ipc/glue/GeckoChildProcessHost.cpp
--- a/ipc/glue/GeckoChildProcessHost.cpp
+++ b/ipc/glue/GeckoChildProcessHost.cpp
@@ -502,17 +502,17 @@ GeckoChildProcessHost::PerformAsyncLaunc
     NS_ASSERTION(directoryService, "Expected XPCOM to be available");
     if (directoryService) {
       nsCOMPtr<nsIFile> greDir;
       nsresult rv = directoryService->Get(NS_GRE_DIR, NS_GET_IID(nsIFile), getter_AddRefs(greDir));
       if (NS_SUCCEEDED(rv)) {
         nsCString path;
         greDir->GetNativePath(path);
 # if defined(OS_LINUX) || defined(OS_BSD)
-#  if defined(MOZ_WIDGET_ANDROID) || defined(OS_BSD)
+#  if defined(MOZ_WIDGET_ANDROID)
         path += "/lib";
 #  endif  // MOZ_WIDGET_ANDROID
         const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH");
         nsCString new_ld_lib_path;
         if (ld_library_path && *ld_library_path) {
             new_ld_lib_path.Assign(path.get());
             new_ld_lib_path.AppendLiteral(":");
             new_ld_lib_path.Append(ld_library_path);