diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2015-12-12 22:46:14 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2015-12-12 22:46:14 +0000 |
| commit | 610472769a5a61dbe301d1e8564e5a241e10918f (patch) | |
| tree | 1696f203e74e8fe6dc7c2c06a8b6430ab1dd1f41 /infrastructure | |
| parent | 8d962f63957455f12be9040ca1df5beb26f204c8 (diff) | |
Export $target_msvc specifically to determine if we are building for MSVC.
In this environment (Windows, non-Cygwin) we have no Unixish shell or commands,
so we need to do some things differently.
Diffstat (limited to 'infrastructure')
| -rw-r--r-- | infrastructure/BoxPlatform.pm.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/infrastructure/BoxPlatform.pm.in b/infrastructure/BoxPlatform.pm.in index e6a335f8..8f9daa81 100644 --- a/infrastructure/BoxPlatform.pm.in +++ b/infrastructure/BoxPlatform.pm.in @@ -1,7 +1,7 @@ package BoxPlatform; use Exporter; @ISA = qw/Exporter/; -@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/; +@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 $target_msvc/; BEGIN { @@ -11,17 +11,20 @@ BEGIN $ac_target_vendor = '@target_vendor@'; $ac_target_os = '@target_os@'; $target_windows = 0; - $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") { + $target_windows = 1; + $target_msvc = 1; $build_os = "winnt"; eval "use Win32"; $build_os_ver = Win32::GetOSName(); } else { + $target_windows = 1 if $ac_target_os =~ m'^mingw32' + or $ac_target_os eq "winnt"; + $target_msvc = 0; $build_os = `uname`; $build_os_ver = `uname -r`; chomp $build_os; |