diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2012-07-24 13:42:06 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2012-07-24 13:42:51 +0200 |
| commit | 22d551b3f636c15468e9411b93872f7ab3aecdea (patch) | |
| tree | d0592995fc5389bf24b897b46a5b0aa570bde908 /solenv/bin | |
| parent | f7fd0e0198bd78c4af07918f5c900b898d4f13a6 (diff) | |
Check for makecab in case we are cross-building .msi.
Change-Id: I57cb8cc9d0173c50f789533a479d55972bdb14b4
Diffstat (limited to 'solenv/bin')
| -rw-r--r-- | solenv/bin/make_installer.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 06ff6b9d71a4..e58bd4d138f5 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -261,7 +261,7 @@ if (!($installer::globals::is_copy_only_project)) { installer::ziplist::set_manu # Checking version of makecab.exe ############################################## -if ( $installer::globals::iswindowsbuild && (!defined($ENV{'CROSS_COMPILING'}) || $ENV{'CROSS_COMPILING'} ne 'YES')) { installer::control::check_makecab_version(); } +if ( $installer::globals::iswindowsbuild && (!defined($ENV{'CROSS_COMPILING'}) || $ENV{'CROSS_COMPILING'} ne 'YES' || $ENV{'PKGFORMAT'} eq 'msi')) { installer::control::check_makecab_version(); } ########################################################## # Getting the include path from the settings in zip list |