diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-01-19 21:10:29 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-01-19 21:10:39 +0200 |
| commit | e3dfe8905fc3d7ec1d0dd0fc20ac1189d2636e53 (patch) | |
| tree | b1dfdcfdf0ee9f8dae716a74dfaeaf41f42199f9 /solenv | |
| parent | c7e3f88b1291c35e09d08d14f82eadf60f7063cd (diff) | |
Handle unxmacxx, too
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/download.pm | 5 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/parameter.pm | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index 6d370ae6e81a..ca39a964b7b1 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -422,6 +422,10 @@ sub get_download_architecture { $arch = "x86"; } + elsif ( $installer::globals::compiler =~ /^unxmacxx/ ) + { + $arch = "x86-64"; + } elsif ( $installer::globals::compiler =~ /^unxmacxp/ ) { $arch = "PPC"; @@ -596,6 +600,7 @@ sub resolve_variables_in_downloadname elsif ( $installer::globals::issolarisx86build ) { $os = "solia"; } elsif ( $installer::globals::islinuxbuild ) { $os = "linux"; } elsif ( $installer::globals::compiler =~ /unxmacxi/ ) { $os = "macosxi"; } + elsif ( $installer::globals::compiler =~ /unxmacxx/ ) { $os = "macosxx"; } elsif ( $installer::globals::compiler =~ /unxmacxp/ ) { $os = "macosxp"; } else { $os = ""; } $downloadname =~ s/\{os\}/$os/; diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm index 2aa0a2806271..deda9d3b7445 100644 --- a/solenv/bin/modules/installer/parameter.pm +++ b/solenv/bin/modules/installer/parameter.pm @@ -268,7 +268,7 @@ sub setglobalvariables } } - if (( $installer::globals::compiler =~ /unxmacxi/ ) || ( $installer::globals::compiler =~ /unxmacxp/ )) + if ( $installer::globals::compiler =~ /unxmacx/ ) { $installer::globals::ismacbuild = 1; |