From 95f28ef759cab4bc2a43239f4513f604081946e7 Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Fri, 15 Sep 2017 14:53:20 -0700
Subject: [PATCH] Backed out changeset d9bc6c96c492 (bug 1399877) for build
 bustage a=backout

MozReview-Commit-ID: 1Ftlwl3MfrW
---
 dom/system/moz.build            | 3 +++
 ipc/glue/moz.build              | 2 +-
 js/src/moz.build                | 2 ++
 moz.configure                   | 3 +--
 security/apps/moz.build         | 2 ++
 security/certverifier/moz.build | 3 +++
 security/manager/ssl/moz.build  | 2 ++
 xpcom/build/nsXPCOMPrivate.h    | 2 +-
 8 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/dom/system/moz.build b/dom/system/moz.build
index d5d4dd091140..3cf7e62bba55 100644
--- a/dom/system/moz.build
+++ b/dom/system/moz.build
@@ -84,5 +84,8 @@ LOCAL_INCLUDES += [
     '/xpcom/base',
 ]
 
+DEFINES['DLL_PREFIX'] = '"%s"' % CONFIG['DLL_PREFIX']
+DEFINES['DLL_SUFFIX'] = '"%s"' % CONFIG['DLL_SUFFIX']
+
 MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
 MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
diff --git a/ipc/glue/moz.build b/ipc/glue/moz.build
index 940cd4227e2b..cb01264e1b61 100644
--- a/ipc/glue/moz.build
+++ b/ipc/glue/moz.build
@@ -220,7 +220,7 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 
 for var in ('MOZ_CHILD_PROCESS_NAME', 'MOZ_CHILD_PROCESS_NAME_PIE',
-            'MOZ_CHILD_PROCESS_BUNDLE'):
+            'MOZ_CHILD_PROCESS_BUNDLE', 'DLL_PREFIX', 'DLL_SUFFIX'):
     DEFINES[var] = '"%s"' % CONFIG[var]
 
 if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT':
diff --git a/js/src/moz.build b/js/src/moz.build
index 4b32f49a59bb..46608fa35e85 100755
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -656,6 +656,8 @@ DEFINES['EXPORT_JS_API'] = True
 
 if CONFIG['JS_HAS_CTYPES']:
     DEFINES['JS_HAS_CTYPES'] = True
+    for var in ('DLL_PREFIX', 'DLL_SUFFIX'):
+        DEFINES[var] = '"%s"' % CONFIG[var]
 
 if CONFIG['MOZ_LINKER']:
     DEFINES['MOZ_LINKER'] = True
diff --git a/moz.configure b/moz.configure
index 7cae1ddc425e..4ea93b7a3d15 100755
--- a/moz.configure
+++ b/moz.configure
@@ -220,8 +220,7 @@ set_config('OBJ_SUFFIX', library_name_info.obj.suffix)
 # Lots of compilation tests depend on this variable being present.
 add_old_configure_assignment('OBJ_SUFFIX', library_name_info.obj.suffix)
 set_config('IMPORT_LIB_SUFFIX', library_name_info.import_lib.suffix)
-set_define('DLL_PREFIX', depends(library_name_info.dll.prefix)(lambda s: '"%s"' % s))
-set_define('DLL_SUFFIX', depends(library_name_info.dll.suffix)(lambda s: '"%s"' % s))
+set_define('MOZ_DLL_SUFFIX', depends(library_name_info.dll.suffix)(lambda s: '"%s"' % s))
 
 include(include_project_configure)
 
diff --git a/security/apps/moz.build b/security/apps/moz.build
index 9f65d7cf652e..62ed0bcbf611 100644
--- a/security/apps/moz.build
+++ b/security/apps/moz.build
@@ -21,6 +21,8 @@ LOCAL_INCLUDES += [
 ]
 
 DEFINES['NSS_ENABLE_ECC'] = 'True'
+for var in ('DLL_PREFIX', 'DLL_SUFFIX'):
+    DEFINES[var] = '"%s"' % CONFIG[var]
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += [
diff --git a/security/certverifier/moz.build b/security/certverifier/moz.build
index cc42c89986b8..dd3be5d6abb9 100644
--- a/security/certverifier/moz.build
+++ b/security/certverifier/moz.build
@@ -45,6 +45,9 @@ if not CONFIG['NSS_NO_EV_CERTS']:
         'ExtendedValidation.cpp',
     ]
 
+for var in ('DLL_PREFIX', 'DLL_SUFFIX'):
+    DEFINES[var] = '"%s"' % CONFIG[var]
+
 LOCAL_INCLUDES += [
     '/security/manager/ssl',
     '/security/pkix/include',
diff --git a/security/manager/ssl/moz.build b/security/manager/ssl/moz.build
index ccb14c716a7f..f611ddbd8f8a 100644
--- a/security/manager/ssl/moz.build
+++ b/security/manager/ssl/moz.build
@@ -183,6 +183,8 @@ if CONFIG['NSS_DISABLE_DBM']:
 
 DEFINES['SSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES'] = 'True'
 DEFINES['NSS_ENABLE_ECC'] = 'True'
+for var in ('DLL_PREFIX', 'DLL_SUFFIX'):
+    DEFINES[var] = '"%s"' % CONFIG[var]
 
 if not CONFIG['MOZ_SYSTEM_NSS']:
     USE_LIBS += [
diff --git a/xpcom/build/nsXPCOMPrivate.h b/xpcom/build/nsXPCOMPrivate.h
index 54f72bfbbf78..133a00325998 100644
--- a/xpcom/build/nsXPCOMPrivate.h
+++ b/xpcom/build/nsXPCOMPrivate.h
@@ -81,7 +81,7 @@ void LogTerm();
 #define XUL_DLL            "XUL"
 #else
 #define XPCOM_SEARCH_KEY  "LD_LIBRARY_PATH"
-#define XUL_DLL   "libxul" DLL_SUFFIX
+#define XUL_DLL   "libxul" MOZ_DLL_SUFFIX
 #endif
 
 #define GRE_CONF_NAME ".gre.config"