diff --git a/taskcluster/ci/toolchain/grcov.yml b/taskcluster/ci/toolchain/grcov.yml index 383678014fb6..27b3079b7cfd 100644 --- a/taskcluster/ci/toolchain/grcov.yml +++ b/taskcluster/ci/toolchain/grcov.yml @@ -22,6 +22,7 @@ linux64-grcov: - linux64-rust-1.47 - linux64-clang - linux64-binutils + - sysroot-x86_64-linux-gnu macosx64-grcov: treeherder: diff --git a/taskcluster/scripts/misc/build-grcov.sh b/taskcluster/scripts/misc/build-grcov.sh index b288b1d66b70..e4bcdb1ed7a2 100755 --- a/taskcluster/scripts/misc/build-grcov.sh +++ b/taskcluster/scripts/misc/build-grcov.sh @@ -10,8 +10,9 @@ case "$(uname -s)" in Linux) export CC=clang export CXX=clang++ - export RUSTFLAGS=-Clinker=clang++ - export CXXFLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 + export RUSTFLAGS="-Clinker=clang++ -C link-arg=--sysroot=$MOZ_FETCHES_DIR/sysroot-x86_64-linux-gnu" + export CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0 --sysroot=$MOZ_FETCHES_DIR/sysroot-x86_64-linux-gnu" + export CFLAGS="--sysroot=$MOZ_FETCHES_DIR/sysroot-x86_64-linux-gnu" export PATH="$MOZ_FETCHES_DIR/clang/bin:$MOZ_FETCHES_DIR/binutils/bin:$PATH" ;;