diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2010-12-21 19:07:12 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@hemulen.(none)> | 2010-12-21 19:07:20 +0200 |
| commit | b326d5decbe8a05df65f92ec4ed908810d68582c (patch) | |
| tree | 2807dfed5e49c3805fd0c1e1fb015e0268b4aea5 | |
| parent | 4ce4ff8a53831b9338fa5b5090c45dad9cf639e0 (diff) | |
Drop msvc*7*.dll, see fdo#32426
| -rwxr-xr-x | post_download.in | 12 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/control.pm | 14 |
2 files changed, 0 insertions, 26 deletions
diff --git a/post_download.in b/post_download.in index a6bef095fe31..9902ea09b1b2 100755 --- a/post_download.in +++ b/post_download.in @@ -113,15 +113,3 @@ Get the version corresponding to your Visual Studio from the Microsoft site and put it into external/vcredist.]) fi fi - -dnl =================================================================== -dnl Windows builds with MSVS 2008/2010 need msvcr71.dll in external/msvcp71 -dnl =================================================================== -if test "$_os" = "WINNT"; then - AC_MSG_CHECKING([for msvcr71.dll]) - if test -f ./external/msvcp71/msvcr71.dll; then - AC_MSG_RESULT([found]) - else - AC_MSG_ERROR([msvcr71.dll is missing in external/msvcp71.]) - fi -fi diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm index 7a4c0efce935..9305d63d8fef 100644 --- a/solenv/bin/modules/installer/control.pm +++ b/solenv/bin/modules/installer/control.pm @@ -77,7 +77,6 @@ sub check_system_path { # The following files have to be found in the environment variable PATH # All platforms: zip - # Windows only: msvcp70.dll, msvcr70.dll for regcomp.exe # Windows only: "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe" for msi database and packaging my $onefile; @@ -105,19 +104,6 @@ sub check_system_path if (($installer::globals::iswin) && ($installer::globals::iswindowsbuild)) { @needed_files_in_path = ("zip.exe", "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe"); - - if ( $installer::globals::compiler eq "wntmsci8" ) - { - push(@needed_files_in_path, "msvcp70.dll"); - push(@needed_files_in_path, "msvcr70.dll"); - } - - if ( $installer::globals::compiler eq "wntmsci10" ) - { - push(@needed_files_in_path, "msvcp71.dll"); - push(@needed_files_in_path, "msvcr71.dll"); - } - } elsif ($installer::globals::iswin) { |