diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-07 00:42:22 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-07 00:42:38 +0200 |
| commit | efdad0b126abd3c151b545740d0530a0a832d482 (patch) | |
| tree | 1aa3e471f1bd2169378ac83abe8e715e528c51fa | |
| parent | a6f81b3a98e136afabda512b4082b2be05490b34 (diff) | |
wntgccx -> Win_x64 for packages
Change-Id: I52fbcee96ad6927a4af49b78001c49916a5c3544
| -rwxr-xr-x | solenv/bin/linkoo | 4 | ||||
| -rw-r--r-- | solenv/bin/modules/installer.pm | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/download.pm | 9 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/globals.pm | 1 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/parameter.pm | 7 |
5 files changed, 19 insertions, 4 deletions
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo index bda2132a4c78..47aa4029948d 100755 --- a/solenv/bin/linkoo +++ b/solenv/bin/linkoo @@ -110,11 +110,11 @@ File::Spec->file_name_is_absolute($OOO_BUILD) || die "linkoo requires absolute p $SOLARVER = "$OOO_BUILD/solver"; -if ($TARGET =~ /^wntgcci/ || $TARGET =~ /^wntmsci[0-9]+/) { +if ($TARGET =~ /^wntgcci/ || $TARGET =~ /^wntgccx/ || $TARGET =~ /^wntmsci[0-9]+/|| $TARGET =~ /^wntmscx[0-9]+/) { $windows = 1; } -if ($TARGET =~ /^wntmsci[0-9]+/) { +if ($TARGET =~ /^wntmsci[0-9]+/ || $TARGET =~ /^wntmscx[0-9]+/) { # wntgcci means are cross-compiling & can symlink, so copy only on real # Windows $copy = 1; diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm index 27244a9ab97b..6ae5b57840a9 100644 --- a/solenv/bin/modules/installer.pm +++ b/solenv/bin/modules/installer.pm @@ -1296,7 +1296,7 @@ sub run { # 1. copy all files that need to be stripped locally # 2. strip all these files - if ( $installer::globals::compiler =~ /wntgcci/ ) + if ( $installer::globals::compiler =~ /wntgcci/ || $installer::globals::compiler =~ /wntgccx/ ) { installer::windows::strip::strip_binaries($filesinproductlanguageresolvedarrayref, $languagestringref); } diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index 9c4dde69caaf..408dc3680521 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -405,7 +405,14 @@ sub get_download_architecture } elsif ( $installer::globals::iswindowsbuild ) { - $arch = "x86"; + if ( $installer::globals::iswin64build ) + { + $arch = "x64"; + } + else + { + $arch = "x86"; + } } elsif ( $installer::globals::compiler =~ /^unxmacxi/ ) { diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 7cd6e92b8e48..cb58cdc04b3a 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -46,6 +46,7 @@ BEGIN $languages_defined_in_productlist = 0; $setupscript_defined_in_productlist = 0; $iswindowsbuild = 0; + $iswin64build = 0; $islinuxbuild = 0; $isrpmbuild = 0; $isdebbuild = 0; diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm index 2a98dd84639d..9c18ca3622e9 100644 --- a/solenv/bin/modules/installer/parameter.pm +++ b/solenv/bin/modules/installer/parameter.pm @@ -247,6 +247,13 @@ sub setglobalvariables if ( $installer::globals::compiler =~ /wnt(msc|gcc)i/ ) { $installer::globals::iswindowsbuild = 1; + $installer::globals::iswin64build = 0; + } + + if ( $installer::globals::compiler =~ /wnt(msc|gcc)x/ ) + { + $installer::globals::iswindowsbuild = 1; + $installer::globals::iswin64build = 1; } if ( $installer::globals::compiler =~ /unxso[lg][siux]/ ) |