Bug 1695835 - Build geckodriver using liblowercase. r=firefox-build-system-reviewers,andi,dmajor

Bug 1694775 had to get a fixup to install the rename utility, that is
not in the base Debian image for buster, while it was there for jessie.
However, we only use rename for a hack when cross-building geckodriver
for Windows, and we don't need to.

Differential Revision: https://phabricator.services.mozilla.com/D106875
This commit is contained in:
Mike Hommey 2021-03-02 21:58:05 +00:00
Родитель 63cb543361
Коммит d1bc707ea0
3 изменённых файлов: 8 добавлений и 10 удалений

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

@ -84,6 +84,7 @@ win32-geckodriver:
fetches:
toolchain:
- linux64-clang
- linux64-liblowercase
- linux64-rust-windows
win64-geckodriver:
@ -104,4 +105,5 @@ win64-geckodriver:
fetches:
toolchain:
- linux64-clang
- linux64-liblowercase
- linux64-rust-windows

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

@ -41,7 +41,6 @@ RUN apt-get update && \
python3-distutils-extra \
python3-requests \
python3-pytoml \
rename \
subversion \
tar \
unzip \

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

@ -9,10 +9,6 @@ export TARGET="$1"
cd $GECKO_PATH
if [ -n "$TOOLTOOL_MANIFEST" ]; then
. taskcluster/scripts/misc/tooltool-download.sh
fi
EXE=
COMPRESS_EXT=gz
@ -27,13 +23,10 @@ case "$TARGET" in
. $GECKO_PATH/taskcluster/scripts/misc/vs-setup.sh
export CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_LINKER=$MOZ_FETCHES_DIR/clang/bin/lld-link
fi
( IFS=\;
for d in $LIB; do
(cd "$d"; rename y/A-Z/a-z/ *)
done
)
# Bug 1584530: don't require the Microsoft MSVC runtime to be installed.
export RUSTFLAGS="-Ctarget-feature=+crt-static"
export LD_PRELOAD=$MOZ_FETCHES_DIR/liblowercase/liblowercase.so
export LOWERCASE_DIRS=$MOZ_FETCHES_DIR/vs2017_15.8.4
;;
# OSX cross builds are a bit harder
x86_64-apple-darwin)
@ -43,6 +36,10 @@ x86_64-apple-darwin)
;;
esac
if [ -n "$TOOLTOOL_MANIFEST" ]; then
. taskcluster/scripts/misc/tooltool-download.sh
fi
export PATH="$MOZ_FETCHES_DIR/rustc/bin:$PATH"
cd $GECKO_PATH/testing/geckodriver