diff --git a/linux/Makefile b/linux/Makefile index 2c523dc..9d8fcb8 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -37,8 +37,8 @@ all : build buildsymbols package artifacts fetch : wget -q -O version "https://gitlab.com/librewolf-community/browser/source/-/raw/main/version" wget -q -O source_release "https://gitlab.com/librewolf-community/browser/source/-/raw/main/release" - wget -q -O "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum" "https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/$$(cat version)-$$(cat source_release)/librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum" - wget --progress=bar:force -O "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz" "https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/$$(cat version)-$$(cat source_release)/librewolf-$$(cat version)-$$(cat source_release).source.tar.gz" + wget -q -O "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum" "https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum?job=Build" + wget --progress=bar:force -O "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz" "https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$$(cat version)-$$(cat source_release).source.tar.gz?job=Build" cat "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum" sha256sum -c "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum" @@ -84,6 +84,7 @@ bootstrap : dir winsdk $$t/mach artifact toolchain --from-build linux64-cbindgen && \ $$t/mach artifact toolchain --from-build linux64-clang && \ $$t/mach artifact toolchain --from-build linux64-dump_syms && \ + $$t/mach artifact toolchain --from-build linux64-liblowercase && \ $$t/mach artifact toolchain --from-build linux64-nasm && \ $$t/mach artifact toolchain --from-build linux64-node && \ $$t/mach artifact toolchain --from-build linux64-rust-cross && \ diff --git a/linux/assets/mozconfig b/linux/assets/mozconfig index 86b302a..f995426 100644 --- a/linux/assets/mozconfig +++ b/linux/assets/mozconfig @@ -1,11 +1,12 @@ # mozconfig - crosscompile from Linux to Windows export MOZBUILD=$HOME/.mozbuild -export WINDOWSSDKDIR="$MOZBUILD/win-cross/vs/Windows Kits/10" +export WINDOWSSDKDIR="$MOZBUILD/win-cross/vs/windows kits/10" ac_add_options --target=x86_64-pc-mingw32 +mk_add_options "export LD_PRELOAD=$MOZBUILD/liblowercase/liblowercase.so" mk_add_options "export LOWERCASE_DIRS=$MOZBUILD/win-cross" -EXTRA_PATH="$MOZBUILD/win-cross/vs/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64:" +EXTRA_PATH="$MOZBUILD/win-cross/vs/vc/tools/msvc/14.29.30133/bin/hostx64/x64:" mk_add_options "export PATH=$EXTRA_PATH$PATH" export CC="$MOZBUILD/clang/bin/clang-cl"