mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-17 06:09:19 +00:00
Bug 1847190 - Don't use the configure_cache in the packed relative relocations configure check. r=firefox-build-system-reviewers,ahochheiden
Differential Revision: https://phabricator.services.mozilla.com/D185418
This commit is contained in:
parent
d66980ade7
commit
bba33ffab4
@ -217,9 +217,9 @@ def try_invoke_compiler(
|
||||
):
|
||||
compiler_path = compiler[0]
|
||||
compiler = wrapper + compiler
|
||||
use_cache = True
|
||||
use_cache = configure_cache is not None
|
||||
|
||||
if compiler_path not in configure_cache.version_checked_compilers:
|
||||
if use_cache and compiler_path not in configure_cache.version_checked_compilers:
|
||||
try:
|
||||
version_info = subprocess.check_output(
|
||||
[compiler_path, "--version"],
|
||||
|
@ -1558,7 +1558,6 @@ with only_when("--enable-compile-environment"):
|
||||
extra_toolchain_flags,
|
||||
linker_ldflags,
|
||||
readelf,
|
||||
configure_cache,
|
||||
when=may_use_pack_relative_relocs,
|
||||
)
|
||||
@checking("for -z pack-relative-relocs option to ld", bool)
|
||||
@ -1571,7 +1570,6 @@ with only_when("--enable-compile-environment"):
|
||||
extra_toolchain_flags,
|
||||
linker_ldflags,
|
||||
readelf,
|
||||
configure_cache,
|
||||
):
|
||||
try:
|
||||
fd, path = mkstemp(prefix="conftest.")
|
||||
@ -1580,7 +1578,9 @@ with only_when("--enable-compile-environment"):
|
||||
pack_rel_relocs = ["-Wl,-z,pack-relative-relocs"]
|
||||
if (
|
||||
try_invoke_compiler(
|
||||
configure_cache,
|
||||
# No configure_cache because it would not create the
|
||||
# expected output file.
|
||||
None,
|
||||
[c_compiler.compiler] + c_compiler.flags,
|
||||
c_compiler.language,
|
||||
# The resulting binary is expected to have relative
|
||||
|
Loading…
x
Reference in New Issue
Block a user