erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-05 08:25:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

chore(core): remove cl from path before build, build static lib

Browse source
This commit is contained in:
Marc Durdin 2023-02-21 13:11:31 +07:00
parent d74b08f37c
commit 29ddeeb67b
2 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/build.sh
View file

@ -17,6 +17,7 @@ cd "$THIS_SCRIPT_PATH"
################################ Main script ################################
get_builder_OS
cleanup_visual_studio_path
MESON_LOW_VERSION=false

26
core/commands.inc.sh
View file

@ -28,7 +28,9 @@ do_configure() {
# do_configure_wasm
locate_emscripten
build_meson_cross_file_for_wasm
STANDARD_MESON_ARGS="$MESON_OPTION_keyman_core_tests --cross-file wasm.defs.build --cross-file wasm.build --default-library static"
STANDARD_MESON_ARGS="$STANDARD_MESON_ARGS --cross-file wasm.defs.build --cross-file wasm.build --default-library static"
elif [[ $target =~ ^(x86|x64)$ ]]; then
STANDARD_MESON_ARGS="$STANDARD_MESON_ARGS --default-library both"
fi
pushd "$THIS_SCRIPT_PATH" > /dev/null
@ -135,3 +137,25 @@ build_meson_cross_file_for_wasm() {
fi
sed -e "s/\$EMSCRIPTEN_BASE/$R/g" wasm.build.$os_id.in > wasm.build
}
#
# Remove Visual Studio from the path so that meson goes looking for it rather than
# assuming that it's all available. If we don't do this, we get an error with link.exe:
#
# meson.build:8:0: ERROR: Found GNU link.exe instead of MSVC link.exe in C:\Program Files\Git\usr\bin\link.EXE.
# This link.exe is not a linker.
# You may need to reorder entries to your %PATH% variable to resolve this.
#
cleanup_visual_studio_path() {
local _split_path _new_path=""
IFS=':' read -ra _split_path <<<"$PATH"
for p in "${_split_path[@]}"; do
if ! [[ $p =~ Visual\ Studio ]]; then
_new_path="$_new_path:$p"
fi
done
echo
PATH="${_new_path:1}"
unset VSINSTALLDIR
}