зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1289641 - Stop depending on the tooltool manifest to distinguish whether to build a windows winchecksec. r=firefox-build-system-reviewers,andi
Differential Revision: https://phabricator.services.mozilla.com/D143257
This commit is contained in:
Родитель
d1119528d0
Коммит
0aa3c95daa
|
@ -254,6 +254,7 @@ linux64-winchecksec:
|
|||
run-on-projects: [trunk]
|
||||
run:
|
||||
script: build-winchecksec.sh
|
||||
arguments: ['x86_64-unknown-linux-gnu']
|
||||
toolchain-artifact: public/build/winchecksec.tar.zst
|
||||
tooltool-downloads: internal
|
||||
fetches:
|
||||
|
@ -272,6 +273,7 @@ win64-winchecksec:
|
|||
run-on-projects: [trunk]
|
||||
run:
|
||||
script: build-winchecksec.sh
|
||||
arguments: ['x86_64-pc-windows-msvc']
|
||||
toolchain-artifact: public/build/winchecksec.tar.zst
|
||||
tooltool-downloads: internal
|
||||
fetches:
|
||||
|
|
|
@ -5,7 +5,11 @@ mkdir -p $UPLOAD_DIR
|
|||
|
||||
cd $MOZ_FETCHES_DIR/winchecksec
|
||||
|
||||
if test -n "$TOOLTOOL_MANIFEST"; then
|
||||
SUFFIX=
|
||||
|
||||
case "$1" in
|
||||
x86_64-pc-windows-msvc)
|
||||
SUFFIX=.exe
|
||||
export PATH="$MOZ_FETCHES_DIR/clang/bin:$PATH"
|
||||
|
||||
export LD_PRELOAD=$MOZ_FETCHES_DIR/liblowercase/liblowercase.so
|
||||
|
@ -38,7 +42,8 @@ EOF
|
|||
-DCMAKE_SYSTEM_NAME=Windows
|
||||
-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded
|
||||
'
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
eval cmake \
|
||||
-GNinja \
|
||||
|
@ -49,5 +54,5 @@ eval cmake \
|
|||
ninja -v
|
||||
|
||||
cd ..
|
||||
tar -caf winchecksec.tar.zst winchecksec/winchecksec${TOOLTOOL_MANIFEST:+.exe}
|
||||
tar -caf winchecksec.tar.zst winchecksec/winchecksec${SUFFIX}
|
||||
cp winchecksec.tar.zst $UPLOAD_DIR/
|
||||
|
|
Загрузка…
Ссылка в новой задаче