diff --git a/mozilla/xpcom/io/nsDirectoryService.cpp b/mozilla/xpcom/io/nsDirectoryService.cpp
index e213746b55b..41951bb3767 100644
--- a/mozilla/xpcom/io/nsDirectoryService.cpp
+++ b/mozilla/xpcom/io/nsDirectoryService.cpp
@@ -273,6 +273,7 @@ nsDirectoryService::GetCurrentProcessDirectory(nsILocalFile** aFile)
     }
     else
     {
+#if defined(DEBUG)
         static PRBool firstWarning = PR_TRUE;
 
         if(firstWarning) {
@@ -280,6 +281,7 @@ nsDirectoryService::GetCurrentProcessDirectory(nsILocalFile** aFile)
             printf("Warning: MOZILLA_FIVE_HOME not set.\n");
             firstWarning = PR_FALSE;
         }
+#endif /* DEBUG */
 
         // Fall back to current directory.
         if (getcwd(buf, sizeof(buf)))
diff --git a/mozilla/xpcom/io/nsSpecialSystemDirectory.cpp b/mozilla/xpcom/io/nsSpecialSystemDirectory.cpp
index a9bda07a1f4..af9140c5332 100644
--- a/mozilla/xpcom/io/nsSpecialSystemDirectory.cpp
+++ b/mozilla/xpcom/io/nsSpecialSystemDirectory.cpp
@@ -390,6 +390,7 @@ static void GetCurrentProcessDirectory(nsFileSpec& aFileSpec)
     }
     else
     {
+#if defined(DEBUG)
         static PRBool firstWarning = PR_TRUE;
 
         if(firstWarning) {
@@ -397,6 +398,7 @@ static void GetCurrentProcessDirectory(nsFileSpec& aFileSpec)
             printf("Warning: MOZILLA_FIVE_HOME not set.\n");
             firstWarning = PR_FALSE;
         }
+#endif /* DEBUG */
 
         // Fall back to current directory.
         if (getcwd(buf, sizeof(buf)))