diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2015-05-16 09:17:21 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2015-05-16 09:17:21 +0000 |
| commit | 03b20d5cadbac58ee0b6ca791750814def9fb6c8 (patch) | |
| tree | 4a3d20429f50badff9e31599aeb2200c9ffef574 /infrastructure/BoxPlatform.pm.in | |
| parent | 950351f985fbad1d4c1af347c14b677864038466 (diff) | |
Allow matching parcel platforms on cpu-vendor and os-cpu-vendor.
Allows us to match 32/64-bit specific targets in parcels.txt.
Add support for variable substitution in parcels.txt.
Diffstat (limited to 'infrastructure/BoxPlatform.pm.in')
| -rw-r--r-- | infrastructure/BoxPlatform.pm.in | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/infrastructure/BoxPlatform.pm.in b/infrastructure/BoxPlatform.pm.in index e8964b0e..23054565 100644 --- a/infrastructure/BoxPlatform.pm.in +++ b/infrastructure/BoxPlatform.pm.in @@ -1,15 +1,18 @@ package BoxPlatform; use Exporter; @ISA = qw/Exporter/; -@EXPORT = qw/$build_os $build_os_ver $target_os $make_command $bsd_make $platform_define $platform_cpu $gcc_v3 $product_version $product_name $install_into_dir $sub_make_options $platform_compile_line_extra $platform_link_line_extra $platform_lib_files $platform_exe_ext $target_windows/; +@EXPORT = qw/$build_os $build_os_ver $ac_target $ac_target_cpu $ac_target_vendor $ac_target_os $make_command $bsd_make $platform_define $platform_cpu $gcc_v3 $product_version $product_name $install_into_dir $sub_make_options $platform_compile_line_extra $platform_link_line_extra $platform_lib_files $platform_exe_ext $target_windows/; BEGIN { # which OS are we building under? - $target_os = '@target_os@'; + $ac_target = '@target@'; + $ac_target_cpu = '@target_cpu@'; + $ac_target_vendor = '@target_vendor@'; + $ac_target_os = '@target_os@'; $target_windows = 0; - $target_windows = 1 if $target_os =~ m'^mingw32' - or $target_os eq "winnt"; + $target_windows = 1 if $ac_target_os =~ m'^mingw32' + or $ac_target_os eq "winnt"; if ($^O eq "MSWin32" and not -x "/usr/bin/uname") { @@ -155,7 +158,7 @@ sub make_flag sub parcel_root { - my $tos = $_[1] || $target_os; + my $tos = $_[1] || $ac_target_os; return $product_name.'-'.$product_version.'-'.$_[0].'-'.$tos; } |