diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index 7323ea5b1adc..e0d85a6e4482 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -6,6 +6,9 @@ FORCE_SHARED_LIB = 1
 MOZILLA_INTERNAL_API = 1
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+# This is going to be a framework named "XUL", not an ordinary library named
+# "libxul.dylib"
+SHARED_LIBRARY_NAME=XUL
 # Setting MAKE_FRAMEWORK makes DLL_PREFIX and DLL_SUFFIX be ignored when
 # setting SHARED_LIBRARY; we need to leave DLL_PREFIX and DLL_SUFFIX
 # as-is so that dependencies of the form -ltracemalloc still work.
@@ -646,7 +649,7 @@ EFFECTIVE_LIB_PREFIX=$(DLL_PREFIX)
 EFFECTIVE_LIB_SUFFIX=$(DLL_SUFFIX)
 endif
 
-GTEST_LIB = $(EFFECTIVE_LIB_PREFIX)gtest/$(EFFECTIVE_LIB_PREFIX)$(LIBRARY_NAME)$(EFFECTIVE_LIB_SUFFIX)
+GTEST_LIB = $(EFFECTIVE_LIB_PREFIX)gtest/$(EFFECTIVE_LIB_PREFIX)$(SHARED_LIBRARY_NAME)$(EFFECTIVE_LIB_SUFFIX)
 EXTRA_MDDEPEND_FILES = $(GTEST_LIB).pp
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
index b9d787fde544..43b284d538af 100644
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -9,12 +9,7 @@ if CONFIG['MOZ_METRO'] and CONFIG['OS_ARCH'] == 'WINNT':
 
 MODULE = 'libxul'
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    # This is going to be a framework named "XUL", not an ordinary library named
-    # "libxul.dylib"
-    LIBRARY_NAME = 'XUL'
-else:
-    LIBRARY_NAME = 'xul'
+LIBRARY_NAME = 'xul'
 
 SOURCES += [
     'nsStaticXULComponents.cpp',