diff options
author | Tor Lillqvist <tlillqvist@novell.com> | 2011-03-15 11:29:49 +0200 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-03-15 11:29:49 +0200 |
commit | 5e9e4c54847fa93b818824022a1015e8a1c7b5cd (patch) | |
tree | f4ab2459b168bff39e18a81bd3acbe24fee1a79f /oowintool | |
parent | Revert "MSVC build creates icudt.lib" (diff) | |
download | core-5e9e4c54847fa93b818824022a1015e8a1c7b5cd.tar.gz core-5e9e4c54847fa93b818824022a1015e8a1c7b5cd.zip |
Revert "Prefer .NET 4, do not bother with .NET 2"
This reverts commit ca448fbaf0b18edcfc809fcabcbcac51bb32f3b7.
Diffstat (limited to 'oowintool')
-rwxr-xr-x | oowintool | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/oowintool b/oowintool index 1c48a1d9e86c..cec0baa7e129 100755 --- a/oowintool +++ b/oowintool @@ -207,8 +207,9 @@ sub print_msvs_productdir() sub print_csc_compiler_dir() { my $dir = cygpath (reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/InstallRoot"), 'w', $output_format); - my $csc_exe = `/bin/find "$dir" -iname csc.exe | grep "v4\." | head -n 1` || - `/bin/find "$dir" -iname csc.exe | grep "v3\.5\." | head -n 1`; + my $csc_exe = `/bin/find "$dir" -iname csc.exe | grep "v3\.5\." | head -n 1` || + `/bin/find "$dir" -iname csc.exe | grep "v4\." | head -n 1` || + `/bin/find "$dir" -iname csc.exe | grep "v2\." | head -n 1`; print `dirname $csc_exe`; } |