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

Bug 1844538 - Properly split environment variables in cargo-linker. r=firefox-build-system-reviewers,ahochheiden

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D184182
This commit is contained in:
Mike Hommey
2023-07-21 08:16:42 +00:00
parent 35da21e524
commit b7acdb051f
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
build/cargo-linker
View File

@@ -27,6 +27,13 @@
import os import os
import sys import sys
# This is not necessarily run with a virtualenv python, so add
# the necessary directory for the shellutil module.
base_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
sys.path.insert(0, os.path.join(base_dir, "python", "mozbuild"))
from mozbuild.shellutil import split
SANITIZERS = { SANITIZERS = {
"asan": "address", "asan": "address",
"hwasan": "hwaddress", "hwasan": "hwaddress",
@@ -37,7 +44,7 @@ SANITIZERS = {
use_clang_sanitizer = os.environ.get("MOZ_CLANG_NEWER_THAN_RUSTC_LLVM") use_clang_sanitizer = os.environ.get("MOZ_CLANG_NEWER_THAN_RUSTC_LLVM")
wrap_ld = os.environ["MOZ_CARGO_WRAP_LD"] wrap_ld = os.environ["MOZ_CARGO_WRAP_LD"]
args = os.environ["MOZ_CARGO_WRAP_LDFLAGS"].split() args = split(os.environ["MOZ_CARGO_WRAP_LDFLAGS"])
for arg in sys.argv[1:]: for arg in sys.argv[1:]:
if arg in ["-lc++", "-lstdc++"]: if arg in ["-lc++", "-lstdc++"]:
wrap_ld = os.environ["MOZ_CARGO_WRAP_LD_CXX"] wrap_ld = os.environ["MOZ_CARGO_WRAP_LD_CXX"]
@@ -54,5 +61,5 @@ for arg in sys.argv[1:]:
continue continue
args.append(arg) args.append(arg)
wrap_ld = wrap_ld.split() wrap_ld = split(wrap_ld)
os.execvp(wrap_ld[0], wrap_ld + args) os.execvp(wrap_ld[0], wrap_ld + args)