Bug 1690937 - Build nasm with a sysroot. r=firefox-build-system-reviewers,sheehan,mhentges

For the same reason we used clang for sccache, we use clang here.

Differential Revision: https://phabricator.services.mozilla.com/D104130
This commit is contained in:
Mike Hommey 2021-02-09 00:44:02 +00:00
Родитель 907f9b6aab
Коммит 8d3954c5fc
2 изменённых файлов: 11 добавлений и 1 удалений

Просмотреть файл

@ -53,6 +53,8 @@ linux64-nasm:
description: "nasm linux64 build"
attributes:
local-toolchain: true
worker:
docker-image: {in-tree: deb10-toolchain-build}
treeherder:
symbol: TL(nasm)
run:
@ -61,14 +63,22 @@ linux64-nasm:
fetches:
fetch:
- nasm-2.14.02
toolchain:
- linux64-clang-11
- linux64-sysroot
linux64-nasm-2.14.02:
description: "nasm linux64 minimum supported version build"
treeherder:
symbol: TL(nasm-2.14.02)
worker:
docker-image: {in-tree: deb10-toolchain-build}
run:
script: build-nasm.sh
arguments: ['linux64']
fetches:
fetch:
- nasm-2.14.02
toolchain:
- linux64-clang-11
- linux64-sysroot

Просмотреть файл

@ -39,7 +39,7 @@ index de99d076..47031e12 100644
if (is_elf32()) {
WRITELONG(pbuf,0); /* null beginning offset */
EOF
./configure
./configure CC="$MOZ_FETCHES_DIR/clang/bin/clang" CFLAGS="--sysroot=$MOZ_FETCHES_DIR/sysroot"
EXE=
;;
esac