diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-27 16:19:43 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-27 18:09:01 +0100 |
| commit | d729d169de479e622e8767edd72aee3ae5bc61a9 (patch) | |
| tree | 01000fbf6cc713644b308299bbfc743b20bc6d15 /solenv | |
| parent | 8827b08dc3ab5a08e929815844737635201b3c1d (diff) | |
normalize values of CROSS_COMPILING
Change-Id: I0cc43cef91e3fcd82a3558a16ab0afbd4d56b141
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer.pm | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/control.pm | 2 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/post_SpeedUpTargets.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm index 237947d43631..ab8406f058b3 100644 --- a/solenv/bin/modules/installer.pm +++ b/solenv/bin/modules/installer.pm @@ -189,7 +189,7 @@ sub run { # Checking version of makecab.exe ############################################## - if ( $installer::globals::iswindowsbuild && (!defined($ENV{'CROSS_COMPILING'}) || $ENV{'CROSS_COMPILING'} ne 'YES' || $installer::globals::packageformat eq 'msi')) { installer::control::check_makecab_version(); } + if ( $installer::globals::iswindowsbuild && (!defined($ENV{'CROSS_COMPILING'}) || $ENV{'CROSS_COMPILING'} ne 'TRUE' || $installer::globals::packageformat eq 'msi')) { installer::control::check_makecab_version(); } ########################################################## # Getting the include path from the settings in zip list diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm index caa9f52b1b9e..1076c8f27d6a 100644 --- a/solenv/bin/modules/installer/control.pm +++ b/solenv/bin/modules/installer/control.pm @@ -70,7 +70,7 @@ sub check_system_path # All platforms: zip # Windows only: "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe" for msi database and packaging - if ($ENV{'CROSS_COMPILING'} eq 'YES') + if ($ENV{'CROSS_COMPILING'} eq 'TRUE') { # we build our own msi* etc. tools when cross-compiling $ENV{'PATH'} .= $installer::globals::pathseparator . $ENV{'WORKDIR_FOR_BUILD'} . '/LinkTarget/Executable'; diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk b/solenv/gbuild/extensions/post_SpeedUpTargets.mk index 4a97a1a31c2f..8967113d905b 100644 --- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk +++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -ifeq ($(CROSS_COMPILING),YES) +ifneq ($(CROSS_COMPILING),) gb_Module_add_targets_for_build := gb_Module_SKIPTARGETS := check slowcheck subsequentcheck endif |