corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1941695 - Rename USE_STATIC_LIBS. r=firefox-build-system-reviewers,application-update-reviewers,media-playback-reviewers,padenot,bytesized,sergesanspaille

Browse Source 
The name is confusing, as it doesn't apply to all libraries, and only on
Windows non-mingw.

Differential Revision: https://phabricator.services.mozilla.com/D234260
This commit is contained in:
Mike Hommey
2025-01-20 20:51:51 +00:00
parent 8b19ef0dc0
commit d7bfe677d7
22 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/pure_virtual/moz.build
View File

@@ -10,7 +10,7 @@ SOURCES += ["pure_virtual.c"]
FORCE_STATIC_LIB = True
USE_STATIC_LIBS = True
USE_STATIC_MSVCRT = True
# Build a real library so that the linker can remove it if the symbol
# is never used.

2
build/win32/crashinjectdll/moz.build
View File

@@ -12,5 +12,5 @@ SharedLibrary("crashinjectdll")
DEFFILE = "crashinjectdll.def"
USE_STATIC_LIBS = True
USE_STATIC_MSVCRT = True
NO_PGO = True

2
build/win32/moz.build
View File

@@ -11,7 +11,7 @@ if CONFIG["ENABLE_TESTS"]:
SOURCES += [
"crashinject.cpp",
]
USE_STATIC_LIBS = True
USE_STATIC_MSVCRT = True
NO_PGO = True

2
dom/media/fake-cdm/moz.build
View File

@@ -26,7 +26,7 @@ if CONFIG["OS_ARCH"] == "WINNT":
"user32",
]
USE_STATIC_LIBS = True
USE_STATIC_MSVCRT = True
NoVisibilityFlags()
# Don't use STL wrappers; this isn't Gecko code
DisableStlWrapping()

2
dom/media/gmp-plugin-openh264/moz.build
View File

@@ -18,7 +18,7 @@ SOURCES += [
SharedLibrary("fakeopenh264")
USE_STATIC_LIBS = True
USE_STATIC_MSVCRT = True
NoVisibilityFlags()
# Don't use STL wrappers; this isn't Gecko code
DisableStlWrapping()

2
modules/libmar/sign/moz.build
View File

@@ -21,4 +21,4 @@ LOCAL_INCLUDES += [
DEFINES["MAR_NSS"] = True
if CONFIG["OS_ARCH"] == "WINNT":
USE_STATIC_LIBS = True
USE_STATIC_MSVCRT = True

2
modules/libmar/src/moz.build
View File

@@ -28,4 +28,4 @@ if CONFIG["MOZ_BUILD_APP"] != "tools/update-packaging":
FORCE_STATIC_LIB = True
if CONFIG["OS_ARCH"] == "WINNT":
USE_STATIC_LIBS = True
USE_STATIC_MSVCRT = True

2
modules/libmar/tool/moz.build
View File

@@ -39,7 +39,7 @@ if CONFIG["MOZ_BUILD_APP"] != "tools/update-packaging":
DEFINES["MAR_NSS"] = True
if CONFIG["OS_ARCH"] == "WINNT":
USE_STATIC_LIBS = True
USE_STATIC_MSVCRT = True
OS_LIBS += [
"ws2_32",

2
modules/libmar/verify/moz.build
View File

@@ -14,7 +14,7 @@ UNIFIED_SOURCES += [
FORCE_STATIC_LIB = True
if CONFIG["OS_ARCH"] == "WINNT":
USE_STATIC_LIBS = True
USE_STATIC_MSVCRT = True
elif CONFIG["OS_ARCH"] == "Darwin" and not CONFIG["MOZ_USE_NSS_FOR_MAR"]:
UNIFIED_SOURCES += [
"MacVerifyCrypto.cpp",

2
modules/xz-embedded/moz.build
View File

@@ -29,6 +29,6 @@ DEFINES['XZ_DEC_X86'] = 1
DEFINES['XZ_USE_CRC64'] = 1
if CONFIG['OS_ARCH'] == 'WINNT':
USE_STATIC_LIBS = True
USE_STATIC_MSVCRT = True
Library('xz-embedded')

2
other-licenses/bsdiff/moz.build
View File

@@ -14,7 +14,7 @@ if CONFIG['HOST_OS_ARCH'] == 'WINNT':
HOST_OS_LIBS += [
'ws2_32',
]
USE_STATIC_LIBS = True
USE_STATIC_MSVCRT = True
LOCAL_INCLUDES += [
'/toolkit/mozapps/update/updater',

3
python/mozbuild/mozbuild/frontend/context.py
View File

@@ -1738,7 +1738,7 @@ VARIABLES = {
"""Whether the library in this directory is a static library.
""",
),
"USE_STATIC_LIBS": (
"USE_STATIC_MSVCRT": (
bool,
bool,
"""Whether the code in this directory is a built against the static
@@ -3112,6 +3112,7 @@ DEPRECATION_HINTS = {
DIST_FILES += [ 'foo' ]
""",
"USE_STATIC_LIBS": "Please use the USE_STATIC_MSVCRT variable instead.",
}
# Make sure that all template variables have a deprecation hint.

8
python/mozbuild/mozbuild/frontend/emitter.py
View File

@@ -1311,17 +1311,17 @@ class TreeMetadataEmitter(LoggingMixin):
passthru.variables["NO_DIST_INSTALL"] = True
# Ideally, this should be done in templates, but this is difficult at
# the moment because USE_STATIC_LIBS can be set after a template
# the moment because USE_STATIC_MSVCRT can be set after a template
# returns. Eventually, with context-based templates, it will be
# possible.
if (
context.config.substs.get("OS_ARCH") == "WINNT"
and context.config.substs.get("CC_TYPE") == "clang-cl"
):
use_static_lib = context.get(
"USE_STATIC_LIBS"
use_static_msvcrt = context.get(
"USE_STATIC_MSVCRT"
) and not context.config.substs.get("MOZ_ASAN")
rtl_flag = "-MT" if use_static_lib else "-MD"
rtl_flag = "-MT" if use_static_msvcrt else "-MD"
if context.config.substs.get("MOZ_DEBUG") and not context.config.substs.get(
"MOZ_NO_DEBUG_RTL"
):

2
testing/tools/minidumpwriter/moz.build
View File

@@ -12,7 +12,7 @@ if CONFIG["ENABLE_TESTS"] and CONFIG["OS_ARCH"] == "WINNT":
SOURCES += [
"minidumpwriter.cpp",
]
USE_STATIC_LIBS = True
USE_STATIC_MSVCRT = True
if CONFIG["CC_TYPE"] in ("clang", "gcc"):
WIN32_EXE_LDFLAGS += ["-municode"]

2
testing/tools/screenshot/moz.build
View File

@@ -17,7 +17,7 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
SOURCES += [
"win32-screenshot.cpp",
]
USE_STATIC_LIBS = True
USE_STATIC_MSVCRT = True
if CONFIG["CC_TYPE"] in ("clang", "gcc"):
WIN32_EXE_LDFLAGS += ["-municode"]
OS_LIBS += [

2
toolkit/components/maintenanceservice/moz.build
View File

@@ -36,7 +36,7 @@ LOCAL_INCLUDES += [
"/toolkit/xre",
]
USE_STATIC_LIBS = True
USE_STATIC_MSVCRT = True
if CONFIG["CC_TYPE"] == "clang-cl":
WIN32_EXE_LDFLAGS += ["-ENTRY:wmainCRTStartup"]

2
toolkit/crashreporter/mozwer/moz.build
View File

@@ -19,6 +19,6 @@ if CONFIG["RUSTC_VERSION"] and CONFIG["RUSTC_VERSION"] >= "1.78.0":
]
DEFFILE = "mozwer.def"
USE_STATIC_LIBS = True
USE_STATIC_MSVCRT = True
SharedLibrary("mozwer")

2
toolkit/mozapps/update/common/moz.build
View File

@@ -30,7 +30,7 @@ if CONFIG["OS_ARCH"] == "WINNT":
Library("updatecommon")
DEFINES["NS_NO_XPCOM"] = True
USE_STATIC_LIBS = True
USE_STATIC_MSVCRT = True
if CONFIG["DISABLE_UPDATER_AUTHENTICODE_CHECK"]:
DEFINES["DISABLE_UPDATER_AUTHENTICODE_CHECK"] = True

2
toolkit/mozapps/update/tests/moz.build
View File

@@ -69,7 +69,7 @@ if CONFIG["CC_TYPE"] == "clang-cl":
if CONFIG["OS_ARCH"] == "WINNT":
DEFINES["UNICODE"] = True
DEFINES["_UNICODE"] = True
USE_STATIC_LIBS = True
USE_STATIC_MSVCRT = True
if CONFIG["CC_TYPE"] in ("clang", "gcc"):
WIN32_EXE_LDFLAGS += ["-municode"]

2
toolkit/mozapps/update/updater/bspatch/moz.build
View File

@@ -5,7 +5,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
if CONFIG["OS_ARCH"] == "WINNT":
USE_STATIC_LIBS = True
USE_STATIC_MSVCRT = True
EXPORTS += [
"bspatch.h",

2
toolkit/mozapps/update/updater/updater-common.build
View File

@@ -43,7 +43,7 @@ if CONFIG["OS_ARCH"] == "WINNT":
RCINCLUDE = "%supdater.rc" % updater_rel_path
DEFINES["UNICODE"] = True
DEFINES["_UNICODE"] = True
USE_STATIC_LIBS = True
USE_STATIC_MSVCRT = True
# Pick up nsWindowsRestart.cpp
LOCAL_INCLUDES += [

2
toolkit/xre/test/win/moz.build
View File

@@ -28,7 +28,7 @@ LOCAL_INCLUDES += [
]
DisableStlWrapping()
USE_STATIC_LIBS = True
USE_STATIC_MSVCRT = True
OS_LIBS += [
"advapi32",