diff --git a/accessible/interfaces/msaa/moz.build b/accessible/interfaces/msaa/moz.build
index 7a1053317a37..e06651313eda 100644
--- a/accessible/interfaces/msaa/moz.build
+++ b/accessible/interfaces/msaa/moz.build
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-GeckoSharedLibrary("AccessibleMarshal", linkage=None)
+GeckoSharedLibrary("AccessibleMarshal")
 
 # Missing here, is the notion that changes to the idl files included by
 # ISimpleDOM.idl (e.g. ISimpleDOMNode.idl) should rebuild the outputs.
diff --git a/build/gecko_templates.mozbuild b/build/gecko_templates.mozbuild
index 11b51aeb8313..002b73b856b6 100644
--- a/build/gecko_templates.mozbuild
+++ b/build/gecko_templates.mozbuild
@@ -109,6 +109,7 @@ def GeckoSharedLibrary(name, output_category=None, **kwargs):
     SharedLibrary(name, output_category)
 
     kwargs.setdefault("mozglue", "library")
+    kwargs.setdefault("linkage", None)
 
     GeckoBinary(**kwargs)
 
diff --git a/config/external/gkcodecs/moz.build b/config/external/gkcodecs/moz.build
index 040f6809deca..1734fdb98ae4 100644
--- a/config/external/gkcodecs/moz.build
+++ b/config/external/gkcodecs/moz.build
@@ -11,7 +11,7 @@
 # both from libxul (when decoding using the codec integration layer Gecko
 # provides) and from ffmpeg (when decoding and encoding through ffmpeg).
 
-GeckoSharedLibrary("gkcodecs", linkage=None)
+GeckoSharedLibrary("gkcodecs")
 SHARED_LIBRARY_NAME = "gkcodecs"
 SYMBOLS_FILE = "gkcodecs.symbols"
 if CONFIG["MOZ_SYSTEM_LIBVPX"]:
diff --git a/config/external/lgpllibs/moz.build b/config/external/lgpllibs/moz.build
index 1ef140baeace..c26817ac44e3 100644
--- a/config/external/lgpllibs/moz.build
+++ b/config/external/lgpllibs/moz.build
@@ -10,7 +10,7 @@
 #
 # Any library added here should also be reflected in the about:license page.
 
-GeckoSharedLibrary("lgpllibs", linkage=None)
+GeckoSharedLibrary("lgpllibs")
 SHARED_LIBRARY_NAME = "lgpllibs"
 
 # For some reason, mingw builds export way too many symbols.
diff --git a/gfx/angle/targets/libEGL/moz.build b/gfx/angle/targets/libEGL/moz.build
index eb8c04949359..263327b57ceb 100644
--- a/gfx/angle/targets/libEGL/moz.build
+++ b/gfx/angle/targets/libEGL/moz.build
@@ -206,4 +206,4 @@ OS_LIBS += [
 
 DEFFILE = "../../checkout/src/libEGL/libEGL_autogen.def"
 RCFILE = "../../checkout/src/libEGL/libEGL.rc"
-GeckoSharedLibrary("libEGL", linkage=None)
+GeckoSharedLibrary("libEGL")
diff --git a/gfx/angle/targets/libGLESv2/moz.build b/gfx/angle/targets/libGLESv2/moz.build
index 18d296d084a4..8d824e8ae57d 100644
--- a/gfx/angle/targets/libGLESv2/moz.build
+++ b/gfx/angle/targets/libGLESv2/moz.build
@@ -425,4 +425,4 @@ OS_LIBS += [
 
 DEFFILE = "../../checkout/src/libGLESv2/libGLESv2_autogen.def"
 RCFILE = "../../checkout/src/libGLESv2/libGLESv2.rc"
-GeckoSharedLibrary("libGLESv2", linkage=None)
+GeckoSharedLibrary("libGLESv2")
diff --git a/gfx/angle/update-angle.py b/gfx/angle/update-angle.py
index 99d65f84f6ef..e80f1739b9cc 100755
--- a/gfx/angle/update-angle.py
+++ b/gfx/angle/update-angle.py
@@ -522,7 +522,7 @@ def export_target(target_full_name) -> Set[str]:
 
     lib_type = desc["type"]
     if lib_type == "shared_library":
-        lines.append(f'GeckoSharedLibrary("{name}", linkage=None)')
+        lines.append(f'GeckoSharedLibrary("{name}")')
     elif lib_type == "static_library":
         lines.append(f'Library("{name}")')
     else:
diff --git a/js/src/build/moz.build b/js/src/build/moz.build
index 0a08b233e154..f40adc434ecd 100644
--- a/js/src/build/moz.build
+++ b/js/src/build/moz.build
@@ -26,7 +26,7 @@ LIBRARY_DEFINES["MOZ_SUPPORT_LEAKCHECKING"] = True
 # JS shell would like to link to the static library.
 
 if CONFIG["JS_SHARED_LIBRARY"]:
-    GeckoSharedLibrary("js", linkage=None)
+    GeckoSharedLibrary("js")
     SHARED_LIBRARY_NAME = CONFIG["JS_LIBRARY_NAME"]
 
     # Ensure symbol versions of shared library on Linux do not conflict
diff --git a/media/gmp-clearkey/0.1/moz.build b/media/gmp-clearkey/0.1/moz.build
index ad393c1c256b..09bd41d65002 100644
--- a/media/gmp-clearkey/0.1/moz.build
+++ b/media/gmp-clearkey/0.1/moz.build
@@ -7,7 +7,7 @@
 with Files("**"):
     BUG_COMPONENT = ("Core", "Audio/Video: GMP")
 
-GeckoSharedLibrary("clearkey", linkage=None)
+GeckoSharedLibrary("clearkey")
 
 FINAL_TARGET = "dist/bin/gmp-clearkey/0.1"
 
diff --git a/media/wmf-clearkey/moz.build b/media/wmf-clearkey/moz.build
index 74680a50e0dc..095e33a76ae8 100644
--- a/media/wmf-clearkey/moz.build
+++ b/media/wmf-clearkey/moz.build
@@ -40,4 +40,4 @@ if CONFIG["CC_TYPE"] == "clang-cl":
         "-Wunused-result",
     ]
 
-GeckoSharedLibrary("wmfclearkey", linkage=None)
+GeckoSharedLibrary("wmfclearkey")
diff --git a/security/moz.build b/security/moz.build
index 4f11c45f9d33..e692bc32f52b 100644
--- a/security/moz.build
+++ b/security/moz.build
@@ -26,7 +26,7 @@ if CONFIG["MOZ_SYSTEM_NSS"]:
 
 include("/build/gyp_base.mozbuild")
 if CONFIG["MOZ_FOLD_LIBS"]:
-    GeckoSharedLibrary("nss", linkage=None)
+    GeckoSharedLibrary("nss")
     # TODO: The library name can be changed when bug 845217 is fixed.
     SHARED_LIBRARY_NAME = "nss3"
 
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
index 59f776ac8f36..7eb15afe7d89 100644
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -19,10 +19,10 @@ def Libxul(name, output_category=None):
     if CONFIG["MOZ_WIDGET_TOOLKIT"] in ("cocoa", "uikit"):
         # This is going to be a framework named "XUL", not an ordinary library named
         # "libxul.dylib"
-        GeckoFramework(name, output_category=output_category, linkage=None)
+        GeckoFramework(name, output_category=output_category)
         SHARED_LIBRARY_NAME = "XUL"
     else:
-        GeckoSharedLibrary(name, output_category=output_category, linkage=None)
+        GeckoSharedLibrary(name, output_category=output_category)
         SHARED_LIBRARY_NAME = "xul"
 
     DELAYLOAD_DLLS += [