Fix .NET detection on 32bit platform

Change-Id: I5eaa098d1de6b57245aca7bba2274139e60ba402
Reviewed-on: https://gerrit.libreoffice.org/23159
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
This commit is contained in:
David Ostrovsky
2016-03-12 00:07:28 +01:00
parent 5da0983a7c
commit dc519b6dea

View File

@@ -5279,13 +5279,17 @@ find_dotnetsdk46()
{
unset frametest
for ver in 4.6; do
# TODO(davido): Do we need to take care about 32bit?
for ver in 4.6.1 4.6; do
reg_get_value_64 "HKEY_LOCAL_MACHINE/SOFTWARE/Wow6432Node/Microsoft/Microsoft SDKs/NETFXSDK/$ver/KitsInstallationFolder"
if test -n "$regvalue"; then
frametest=$regvalue
return
fi
reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/NETFXSDK/$ver/KitsInstallationFolder"
if test -n "$regvalue"; then
frametest=$regvalue
return
fi
done
}