Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit 108b7dd

Browse files
author
Trevor Saunders
committed
backout bug 886526 because it probably made us use a lot more memory to link on windows
1 parent 0069d4e commit 108b7dd

87 files changed

Lines changed: 208 additions & 43 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎config/config.mk‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,9 @@ _ENABLE_PIC=1
235235

236236
ifdef LIBXUL_LIBRARY
237237
ifdef IS_COMPONENT
238-
$(error IS_COMPONENT is set, but is not compatible with LIBXUL_LIBRARY)
238+
ifndef MODULE_NAME
239+
$(error Component makefile does not specify MODULE_NAME.)
239240
endif
240-
ifdef MODULE_NAME
241-
$(error MODULE_NAME is $(MODULE_NAME) but MODULE_NAME and LIBXUL_LIBRARY are not compatible)
242241
endif
243242
ifdef FORCE_STATIC_LIB
244243
$(error Makefile sets FORCE_STATIC_LIB which was already implied by LIBXUL_LIBRARY)

‎docshell/build/Makefile.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ topsrcdir = @top_srcdir@
88
srcdir = @srcdir@
99
VPATH = @srcdir@
1010

11+
IS_COMPONENT = 1
12+
MODULE_NAME = docshell_provider
1113

1214
include $(DEPTH)/config/autoconf.mk
1315

‎dom/media/bridge/Makefile.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ VPATH = @srcdir@
99

1010
include $(DEPTH)/config/autoconf.mk
1111

12+
MODULE_NAME = peerconnection
1213

14+
IS_COMPONENT = 1
1315
EXPORT_LIBRARY = 1
1416
LIBXUL_LIBRARY = 1
1517

‎dom/plugins/base/Makefile.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ include $(DEPTH)/config/autoconf.mk
1313
LIBRARY_NAME = gkplugin
1414
MSVC_ENABLE_PGO := 1
1515
EXPORT_LIBRARY = 1
16+
IS_COMPONENT = 1
17+
MODULE_NAME = nsPluginModule
1618
LIBXUL_LIBRARY = 1
1719

1820
ifeq ($(MOZ_WIDGET_TOOLKIT),android)

‎dom/src/jsurl/Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ FAIL_ON_WARNINGS := 1
1111

1212
include $(DEPTH)/config/autoconf.mk
1313

14+
MODULE_NAME = javascript__protocol
1415
LIBXUL_LIBRARY = 1
1516

1617
LOCAL_INCLUDES += \

‎editor/composer/src/Makefile.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ VPATH = @srcdir@
1111
include $(DEPTH)/config/autoconf.mk
1212

1313
EXPORT_LIBRARY = 1
14+
IS_COMPONENT = 1
15+
MODULE_NAME = nsComposerModule
1416
LIBXUL_LIBRARY = 1
1517
FAIL_ON_WARNINGS = 1
1618

‎editor/txmgr/src/Makefile.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ FAIL_ON_WARNINGS = 1
1212
include $(DEPTH)/config/autoconf.mk
1313

1414
EXPORT_LIBRARY = 1
15+
IS_COMPONENT = 1
16+
MODULE_NAME = nsTransactionManagerModule
1517
LIBXUL_LIBRARY = 1
1618

1719

‎editor/txtsvc/src/Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ FAIL_ON_WARNINGS = 1
1111

1212
include $(DEPTH)/config/autoconf.mk
1313

14+
MODULE_NAME = nsTextServicesModule
1415
LIBXUL_LIBRARY = 1
1516

1617

‎embedding/browser/build/Makefile.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ VPATH = @srcdir@
1010

1111
include $(DEPTH)/config/autoconf.mk
1212

13+
IS_COMPONENT = 1
14+
MODULE_NAME = Browser_Embedding_Module
1315
EXPORT_LIBRARY = 1
1416
LIBXUL_LIBRARY = 1
1517
FAIL_ON_WARNINGS = 1

‎embedding/components/build/Makefile.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ VPATH = @srcdir@
1010
include $(DEPTH)/config/autoconf.mk
1111

1212
EXPORT_LIBRARY = 1
13+
IS_COMPONENT = 1
14+
MODULE_NAME = embedcomponents
1315
LIBXUL_LIBRARY = 1
1416
FAIL_ON_WARNINGS = 1
1517

0 commit comments

Comments
 (0)