зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1788858 - Remove HOST_MAJOR_VERSION. r=firefox-build-system-reviewers,necko-reviewers,andi
`HAS_CONNECTX` is not used in `netwerk/protocol/http` as of bug 1689604
.
In NSPR, it is used to enable the use of `connectx`, which is available
since macOS 10.11, and we target 10.12, which means it's always
available, so we don't need to check for it based on the target version
(and checking the host version was wrong, too).
Differential Revision: https://phabricator.services.mozilla.com/D156275
This commit is contained in:
Родитель
88ec6bec35
Коммит
3b6d66eba3
|
@ -724,15 +724,6 @@ set_define("HAVE_64BIT_BUILD", have_64_bit)
|
|||
add_old_configure_assignment("HAVE_64BIT_BUILD", have_64_bit)
|
||||
|
||||
|
||||
@depends(host)
|
||||
def host_os_kernel_major_version(host):
|
||||
versions = host.raw_os.split(".")
|
||||
version = "".join(x for x in versions[0] if x.isdigit())
|
||||
return version
|
||||
|
||||
|
||||
set_config("HOST_MAJOR_VERSION", host_os_kernel_major_version)
|
||||
|
||||
# Autoconf needs these set
|
||||
|
||||
|
||||
|
|
|
@ -39,10 +39,7 @@ elif CONFIG["OS_TARGET"] == "Darwin":
|
|||
# See also IncreaseDescriptorLimits in toolkit/xre/nsAppRunner.cpp
|
||||
DEFINES["FD_SETSIZE"] = 4096
|
||||
DEFINES["_DARWIN_UNLIMITED_SELECT"] = True
|
||||
if not CONFIG["HOST_MAJOR_VERSION"]:
|
||||
DEFINES["HAS_CONNECTX"] = True
|
||||
elif CONFIG["HOST_MAJOR_VERSION"] >= "15":
|
||||
DEFINES["HAS_CONNECTX"] = True
|
||||
DEFINES["HAS_CONNECTX"] = True
|
||||
DEFINES["DARWIN"] = True
|
||||
DEFINES["HAVE_BSD_FLOCK"] = True
|
||||
DEFINES["HAVE_SOCKLEN_T"] = True
|
||||
|
|
|
@ -212,10 +212,4 @@ XPCOM_MANIFESTS += [
|
|||
"components.conf",
|
||||
]
|
||||
|
||||
if CONFIG["OS_TARGET"] == "Darwin":
|
||||
if not CONFIG["HOST_MAJOR_VERSION"]:
|
||||
DEFINES["HAS_CONNECTX"] = True
|
||||
elif CONFIG["HOST_MAJOR_VERSION"] >= "15":
|
||||
DEFINES["HAS_CONNECTX"] = True
|
||||
|
||||
include("/tools/fuzzing/libfuzzer-config.mozbuild")
|
||||
|
|
Загрузка…
Ссылка в новой задаче