diff --git a/browser/components/about/moz.build b/browser/components/about/moz.build index e1b4c3e6767..20215b3cdfb 100644 --- a/browser/components/about/moz.build +++ b/browser/components/about/moz.build @@ -16,6 +16,4 @@ SOURCES += [ LIBRARY_NAME = 'browserabout_s' -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'browsercomps' diff --git a/browser/components/dirprovider/moz.build b/browser/components/dirprovider/moz.build index 6675d632df5..b321efdbc35 100644 --- a/browser/components/dirprovider/moz.build +++ b/browser/components/dirprovider/moz.build @@ -20,6 +20,4 @@ XPCSHELL_TESTS_MANIFESTS += [ 'tests/unit/xpcshell.ini', ] -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'browsercomps' diff --git a/browser/components/feeds/src/moz.build b/browser/components/feeds/src/moz.build index 11636afdf3d..ece3aa30560 100644 --- a/browser/components/feeds/src/moz.build +++ b/browser/components/feeds/src/moz.build @@ -22,6 +22,4 @@ EXTRA_PP_COMPONENTS += [ LIBRARY_NAME = 'browser_feeds_s' -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'browsercomps' diff --git a/browser/components/migration/src/moz.build b/browser/components/migration/src/moz.build index 3705e268b7e..7c8acc3255b 100644 --- a/browser/components/migration/src/moz.build +++ b/browser/components/migration/src/moz.build @@ -42,6 +42,4 @@ EXTRA_PP_JS_MODULES += [ 'MigrationUtils.jsm', ] -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'browsercomps' diff --git a/browser/components/shell/src/moz.build b/browser/components/shell/src/moz.build index 3b5e1b5a583..6e8b843db98 100644 --- a/browser/components/shell/src/moz.build +++ b/browser/components/shell/src/moz.build @@ -27,6 +27,4 @@ EXTRA_COMPONENTS += [ 'nsSetDefaultBrowser.manifest', ] -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'browsercomps' diff --git a/content/media/omx/mediaresourcemanager/moz.build b/content/media/omx/mediaresourcemanager/moz.build index b124d406070..e80c13bcbcf 100644 --- a/content/media/omx/mediaresourcemanager/moz.build +++ b/content/media/omx/mediaresourcemanager/moz.build @@ -18,6 +18,4 @@ LIBRARY_NAME = 'mediaresourcemanager' include('/ipc/chromium/chromium-config.mozbuild') -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'gklayout' diff --git a/gfx/graphite2/src/moz.build b/gfx/graphite2/src/moz.build index 89ef95e48a1..9438475fc6a 100644 --- a/gfx/graphite2/src/moz.build +++ b/gfx/graphite2/src/moz.build @@ -6,9 +6,7 @@ MODULE = 'graphite2' -if CONFIG['OS_TARGET'] == 'WINNT': - FORCE_STATIC_LIB = True -else: +if CONFIG['OS_TARGET'] != 'WINNT': LIBXUL_LIBRARY = True # This should contain all of the _PUBLIC_HEADERS from files.mk diff --git a/gfx/harfbuzz/src/moz.build b/gfx/harfbuzz/src/moz.build index a2cf6c0a3a8..99d898a8960 100644 --- a/gfx/harfbuzz/src/moz.build +++ b/gfx/harfbuzz/src/moz.build @@ -6,9 +6,7 @@ MODULE = 'harfbuzz' -if CONFIG['OS_ARCH'] == 'WINNT': - FORCE_STATIC_LIB = True -else: +if CONFIG['OS_ARCH'] != 'WINNT': LIBXUL_LIBRARY = True EXPORTS.harfbuzz += [ diff --git a/gfx/ots/src/moz.build b/gfx/ots/src/moz.build index a92820d4106..63a0838411b 100644 --- a/gfx/ots/src/moz.build +++ b/gfx/ots/src/moz.build @@ -6,9 +6,7 @@ MODULE = 'ots' -if CONFIG['OS_TARGET'] == 'WINNT': - FORCE_STATIC_LIB = True -else: +if CONFIG['OS_TARGET'] != 'WINNT': LIBXUL_LIBRARY = True EXPORTS += [ diff --git a/media/libcubeb/src/moz.build b/media/libcubeb/src/moz.build index 05c848f7218..3d1ff0918f1 100644 --- a/media/libcubeb/src/moz.build +++ b/media/libcubeb/src/moz.build @@ -51,8 +51,6 @@ LIBRARY_NAME = 'cubeb' MSVC_ENABLE_PGO = True -FORCE_STATIC_LIB = True - if CONFIG['OS_TARGET'] == 'WINNT': NO_VISIBILITY_FLAGS = True diff --git a/media/libjpeg/moz.build b/media/libjpeg/moz.build index d63d14a8de6..eb05ef9229c 100644 --- a/media/libjpeg/moz.build +++ b/media/libjpeg/moz.build @@ -150,9 +150,6 @@ LIBRARY_NAME = 'mozjpeg' MSVC_ENABLE_PGO = True -# need static lib for some of the libimg componentry to link properly -FORCE_STATIC_LIB = True - if CONFIG['OS_TARGET'] == 'WINNT': NO_VISIBILITY_FLAGS = True diff --git a/media/libnestegg/src/moz.build b/media/libnestegg/src/moz.build index ee9e08ac4a1..fe5ea5132fd 100644 --- a/media/libnestegg/src/moz.build +++ b/media/libnestegg/src/moz.build @@ -15,8 +15,6 @@ LIBRARY_NAME = 'nestegg' MSVC_ENABLE_PGO = True -FORCE_STATIC_LIB = True - if CONFIG['OS_TARGET'] == 'WINNT': NO_VISIBILITY_FLAGS = True diff --git a/media/libogg/moz.build b/media/libogg/moz.build index 0a88ae6f1c0..7ae6571f2f2 100644 --- a/media/libogg/moz.build +++ b/media/libogg/moz.build @@ -21,8 +21,6 @@ UNIFIED_SOURCES += [ MSVC_ENABLE_PGO = True -FORCE_STATIC_LIB = True - if CONFIG['OS_TARGET'] == 'WINNT': NO_VISIBILITY_FLAGS = True diff --git a/media/libopus/moz.build b/media/libopus/moz.build index 064011fce06..82ed614df96 100644 --- a/media/libopus/moz.build +++ b/media/libopus/moz.build @@ -17,6 +17,4 @@ LIBRARY_NAME = 'opus' MSVC_ENABLE_PGO = True -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'gkmedias' diff --git a/media/libpng/moz.build b/media/libpng/moz.build index b30d942e223..aaae56d33e4 100644 --- a/media/libpng/moz.build +++ b/media/libpng/moz.build @@ -49,8 +49,6 @@ LIBRARY_NAME = 'mozpng' MSVC_ENABLE_PGO = True -FORCE_STATIC_LIB = True - if CONFIG['OS_TARGET'] == 'WINNT': NO_VISIBILITY_FLAGS = True diff --git a/media/libspeex_resampler/src/moz.build b/media/libspeex_resampler/src/moz.build index 7b13b646fa8..0c761b53ca9 100644 --- a/media/libspeex_resampler/src/moz.build +++ b/media/libspeex_resampler/src/moz.build @@ -24,6 +24,4 @@ SOURCES += [ MSVC_ENABLE_PGO = True -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'gkmedias' diff --git a/media/libtheora/lib/moz.build b/media/libtheora/lib/moz.build index 5bca5d6227f..1c4afc8abef 100644 --- a/media/libtheora/lib/moz.build +++ b/media/libtheora/lib/moz.build @@ -61,8 +61,6 @@ if CONFIG['GNU_AS']: MSVC_ENABLE_PGO = True -FORCE_STATIC_LIB = True - if CONFIG['OS_TARGET'] == 'WINNT': NO_VISIBILITY_FLAGS = True diff --git a/media/libtremor/lib/moz.build b/media/libtremor/lib/moz.build index 0f71552ae29..01c933e7baf 100644 --- a/media/libtremor/lib/moz.build +++ b/media/libtremor/lib/moz.build @@ -23,6 +23,4 @@ SOURCES += [ 'tremor_window.c', ] -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'gkmedias' diff --git a/media/libvorbis/moz.build b/media/libvorbis/moz.build index 3f6f1c2c92d..a9b60d95e1a 100644 --- a/media/libvorbis/moz.build +++ b/media/libvorbis/moz.build @@ -47,8 +47,6 @@ if CONFIG['OS_ARCH'] == 'SunOS': MSVC_ENABLE_PGO = True -FORCE_STATIC_LIB = True - if CONFIG['OS_TARGET'] == 'WINNT': NO_VISIBILITY_FLAGS = True diff --git a/media/libvpx/moz.build b/media/libvpx/moz.build index 74eca772100..07856536495 100644 --- a/media/libvpx/moz.build +++ b/media/libvpx/moz.build @@ -94,8 +94,6 @@ SOURCES += [ MSVC_ENABLE_PGO = True -FORCE_STATIC_LIB = True - if CONFIG['OS_TARGET'] == 'WINNT': NO_VISIBILITY_FLAGS = True diff --git a/memory/build/moz.build b/memory/build/moz.build index 6956c278afd..11283efcc0a 100644 --- a/memory/build/moz.build +++ b/memory/build/moz.build @@ -33,8 +33,6 @@ if CONFIG['MOZ_REPLACE_MALLOC']: LIBRARY_NAME = 'memory' -FORCE_STATIC_LIB = True - # Keep jemalloc separated when mozglue is statically linked if CONFIG['MOZ_MEMORY'] and (CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android') or CONFIG['MOZ_NATIVE_JEMALLOC']): diff --git a/mfbt/moz.build b/mfbt/moz.build index 7c6380fd8ee..89f370da219 100644 --- a/mfbt/moz.build +++ b/mfbt/moz.build @@ -10,8 +10,6 @@ MODULE = 'mozglue' LIBRARY_NAME = 'mfbt' -FORCE_STATIC_LIB = True - mfbt_root = '.' include('common.mozbuild') diff --git a/mozglue/android/moz.build b/mozglue/android/moz.build index b96e2b90c1c..f5fcd183b2a 100644 --- a/mozglue/android/moz.build +++ b/mozglue/android/moz.build @@ -21,6 +21,4 @@ LIBRARY_NAME = 'android' FAIL_ON_WARNINGS = True -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'mozglue' diff --git a/mozglue/linker/moz.build b/mozglue/linker/moz.build index d10f6e5615d..5c2cd72dff8 100644 --- a/mozglue/linker/moz.build +++ b/mozglue/linker/moz.build @@ -23,6 +23,4 @@ HOST_SOURCES += [ HOST_PROGRAM = 'szip' -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'mozglue' diff --git a/other-licenses/android/moz.build b/other-licenses/android/moz.build index c062ff8f57c..4c13232fc1d 100644 --- a/other-licenses/android/moz.build +++ b/other-licenses/android/moz.build @@ -27,6 +27,4 @@ SOURCES += [ 'res_state.c', ] -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'mozglue' diff --git a/parser/expat/lib/moz.build b/parser/expat/lib/moz.build index fd25980d1c6..6d9d155cf81 100644 --- a/parser/expat/lib/moz.build +++ b/parser/expat/lib/moz.build @@ -21,7 +21,4 @@ SOURCES += [ MSVC_ENABLE_PGO = True -# We want only the static lib, not the shared lib -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'gkmedias' diff --git a/toolkit/components/protobuf/moz.build b/toolkit/components/protobuf/moz.build index 37de36c7c0d..c307fed89b3 100644 --- a/toolkit/components/protobuf/moz.build +++ b/toolkit/components/protobuf/moz.build @@ -47,6 +47,4 @@ SOURCES += [ LIBRARY_NAME = 'protobuf_s' -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'toolkitcomps' diff --git a/toolkit/crashreporter/breakpad-windows-libxul/moz.build b/toolkit/crashreporter/breakpad-windows-libxul/moz.build index 49e7f0f6b8a..6d488d4291c 100644 --- a/toolkit/crashreporter/breakpad-windows-libxul/moz.build +++ b/toolkit/crashreporter/breakpad-windows-libxul/moz.build @@ -10,6 +10,4 @@ SOURCES += [ LIBRARY_NAME = 'google_breakpad_libxul_s' -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/breakpad-windows-standalone/moz.build b/toolkit/crashreporter/breakpad-windows-standalone/moz.build index 5ed82bca5fa..7364597df52 100644 --- a/toolkit/crashreporter/breakpad-windows-standalone/moz.build +++ b/toolkit/crashreporter/breakpad-windows-standalone/moz.build @@ -6,6 +6,4 @@ LIBRARY_NAME = 'google_breakpad_standalone_s' -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'breakpadinjector' diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build b/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build index a27946f7d70..e391e09c26c 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build @@ -13,7 +13,4 @@ SOURCES += [ LIBRARY_NAME = 'crash_generation_s' -# need static lib -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build index b182d24e40b..5a92f2b0496 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build @@ -16,7 +16,4 @@ LIBRARY_NAME = 'exception_handler_s' XPI_NAME = 'crashreporter' -# need static lib -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build index f4851b25efa..7a6cbc2f11f 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build @@ -16,7 +16,4 @@ LIBRARY_NAME = 'minidump_writer_s' XPI_NAME = 'crashreporter' -# need static lib -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build index 785eabc24b9..7a2f294ce0b 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build @@ -15,7 +15,4 @@ LIBRARY_NAME = 'crash_generation_s' XPI_NAME = 'crashreporter' -# need static lib -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build index ea3e4d42b62..7db1f25c520 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build @@ -17,7 +17,4 @@ LIBRARY_NAME = 'exception_handler_s' XPI_NAME = 'crashreporter' -# need static lib -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/google-breakpad/src/client/moz.build b/toolkit/crashreporter/google-breakpad/src/client/moz.build index d1769087d50..7cb1d404778 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/client/moz.build @@ -14,7 +14,4 @@ LIBRARY_NAME = 'minidump_file_writer_s' XPI_NAME = 'crashreporter' -# need static lib -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build b/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build index 4ef5d2fe422..53458389933 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build @@ -16,7 +16,4 @@ LIBRARY_NAME = 'exception_handler_s' XPI_NAME = 'crashreporter' -# need static lib -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build b/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build index c953eeba3f2..88a070e1328 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build @@ -34,7 +34,4 @@ if CONFIG['MOZ_CRASHREPORTER']: LIBRARY_NAME = 'breakpad_linux_common_s' -# need static lib -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build b/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build index b5b61397908..e082e8d08bf 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build @@ -34,7 +34,4 @@ SOURCES += [ LIBRARY_NAME = 'breakpad_mac_common_s' -# need static lib -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/google-breakpad/src/common/moz.build b/toolkit/crashreporter/google-breakpad/src/common/moz.build index 006550f0950..b74b6b80884 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/common/moz.build @@ -84,7 +84,4 @@ LIBRARY_NAME = 'breakpad_common_s' MSVC_ENABLE_PGO = True -# need static lib -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build b/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build index e11342b629a..3bf83ea6358 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build @@ -24,7 +24,4 @@ HOST_SOURCES += [ 'guid_creator.cc', ] -# need static lib -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/google-breakpad/src/processor/moz.build b/toolkit/crashreporter/google-breakpad/src/processor/moz.build index 30a62bd6dc1..01db37a116d 100644 --- a/toolkit/crashreporter/google-breakpad/src/processor/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/processor/moz.build @@ -25,7 +25,4 @@ SOURCES += [ LIBRARY_NAME = 'breakpad_sps_common_s' -# need static lib -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'xulapp_s' diff --git a/widget/qt/faststartupqt/moz.build b/widget/qt/faststartupqt/moz.build index 6debcff6813..32ed9d93292 100644 --- a/widget/qt/faststartupqt/moz.build +++ b/widget/qt/faststartupqt/moz.build @@ -23,6 +23,4 @@ SOURCES += [ LIBRARY_NAME = 'faststartupqt' -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'xul' diff --git a/widget/xremoteclient/moz.build b/widget/xremoteclient/moz.build index c16d42d4ad2..36db9614212 100644 --- a/widget/xremoteclient/moz.build +++ b/widget/xremoteclient/moz.build @@ -10,6 +10,4 @@ PROGRAM = 'mozilla-xremote-client' LIBRARY_NAME = 'xremote_client_s' -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'xulapp_s' diff --git a/xpcom/reflect/xptcall/src/md/os2/moz.build b/xpcom/reflect/xptcall/src/md/os2/moz.build index bcb5cee53be..b4f8bc6b73b 100644 --- a/xpcom/reflect/xptcall/src/md/os2/moz.build +++ b/xpcom/reflect/xptcall/src/md/os2/moz.build @@ -13,7 +13,4 @@ SOURCES += [ LIBRARY_NAME = 'xptcmd' -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'xpcom_core' diff --git a/xpcom/reflect/xptcall/src/md/unix/moz.build b/xpcom/reflect/xptcall/src/md/unix/moz.build index 4e9a245860b..a222eb4138c 100644 --- a/xpcom/reflect/xptcall/src/md/unix/moz.build +++ b/xpcom/reflect/xptcall/src/md/unix/moz.build @@ -324,7 +324,4 @@ if CONFIG['OS_ARCH'] == 'Linux': LIBRARY_NAME = 'xptcmd' -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'xpcom_core' diff --git a/xpcom/reflect/xptcall/src/md/win32/moz.build b/xpcom/reflect/xptcall/src/md/win32/moz.build index 53728623b7c..02158a1b8d6 100644 --- a/xpcom/reflect/xptcall/src/md/win32/moz.build +++ b/xpcom/reflect/xptcall/src/md/win32/moz.build @@ -38,7 +38,4 @@ else: LIBRARY_NAME = 'xptcmd' -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'xpcom_core' diff --git a/xpcom/string/src/moz.build b/xpcom/string/src/moz.build index 417bc983672..5f05efd7a79 100644 --- a/xpcom/string/src/moz.build +++ b/xpcom/string/src/moz.build @@ -33,8 +33,4 @@ LIBRARY_NAME = 'string_s' MSVC_ENABLE_PGO = True -# we don't want the shared lib, but we want to force the creation of a -# static lib. -FORCE_STATIC_LIB = True - FINAL_LIBRARY = 'xpcom_core'