зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1719226 - Remove old workarounds when building clang. r=firefox-build-system-reviewers,andi
- we needed -gcc-toolchain to pick C/C++ standard headers from the right version of GCC, but we now have them in the toolchain sysroot (bug 1719207), so we can use that instead. - we needed LD_LIBRARY_PATH when clang was built on an older version of Debian, but that was changed in bug 1694775. Differential Revision: https://phabricator.services.mozilla.com/D119135
This commit is contained in:
Родитель
3c173089ef
Коммит
51effea05b
|
@ -842,17 +842,11 @@ if __name__ == "__main__":
|
|||
elif is_linux():
|
||||
extra_cflags = []
|
||||
extra_cxxflags = []
|
||||
# When building stage2 and stage3, we want the newly-built clang to pick
|
||||
# up whatever headers were installed from the gcc we used to build stage1,
|
||||
# always, rather than the system headers. Providing -gcc-toolchain
|
||||
# encourages clang to do that.
|
||||
extra_cflags2 = ["-fPIC", "-gcc-toolchain", stage1_inst_dir]
|
||||
extra_cflags2 = ["-fPIC"]
|
||||
# Silence clang's warnings about arguments not being used in compilation.
|
||||
extra_cxxflags2 = [
|
||||
"-fPIC",
|
||||
"-Qunused-arguments",
|
||||
"-gcc-toolchain",
|
||||
stage1_inst_dir,
|
||||
]
|
||||
extra_asmflags = []
|
||||
# Avoid libLLVM internal function calls going through the PLT.
|
||||
|
@ -863,14 +857,6 @@ if __name__ == "__main__":
|
|||
# here. LLVM's build system is also picky about turning on ICF, so
|
||||
# we do that explicitly here, too.
|
||||
extra_ldflags += ["-fuse-ld=gold", "-Wl,--gc-sections", "-Wl,--icf=safe"]
|
||||
|
||||
if "LD_LIBRARY_PATH" in os.environ:
|
||||
os.environ["LD_LIBRARY_PATH"] = "%s/lib64/:%s" % (
|
||||
gcc_dir,
|
||||
os.environ["LD_LIBRARY_PATH"],
|
||||
)
|
||||
else:
|
||||
os.environ["LD_LIBRARY_PATH"] = "%s/lib64/" % gcc_dir
|
||||
elif is_windows():
|
||||
extra_cflags = []
|
||||
extra_cxxflags = []
|
||||
|
|
Загрузка…
Ссылка в новой задаче