Skip to content

Commit 01cd3b1

Browse files
committed
[Win32] Also test for stdckdint.h availability on MSC builds of perl.
1 parent 00505d6 commit 01cd3b1

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

win32/config_sh.PL

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,12 @@ my $ver = `ver 2>nul`;
148148
$opt{osvers} = $ver =~ /\b(\d+(?:\.\d+)+)\b/ ? $1 : '4.0';
149149

150150
if (exists $opt{cc}) {
151+
`$opt{cc} -o have_stdckdint.exe configure/have_stdckdint.c 1>nul 2>&1`;
152+
if (-e 'have_stdckdint.exe') {
153+
$opt{i_stdckdint} = 'define' if `have_stdckdint` eq '0';
154+
unlink 'have_stdckdint.exe'; # have_stdckdint.exe no longer needed
155+
}
156+
151157
# cl version detection borrowed from Test::Smoke's configsmoke.pl
152158
if ($opt{cc} =~ /\b(?:cl|icl)/) { #MSVC can come as clarm.exe, icl=Intel C
153159
my $output = `$opt{cc} 2>&1`;
@@ -158,12 +164,6 @@ if (exists $opt{cc}) {
158164
chomp($opt{libc} = `$opt{cc} -o rt.exe configure/rt.c 1>nul 2>&1 && rt`);
159165
if(-e 'rt.exe') { unlink 'rt.exe' } # rt.exe no longer needed
160166
else { die "Failed to identify default runtime" }
161-
162-
`$opt{cc} -o have_stdckdint.exe configure/have_stdckdint.c 1>nul 2>&1`;
163-
if(-e 'have_stdckdint.exe') {
164-
$opt{i_stdckdint} = 'define' if `have_stdckdint` eq '0';
165-
unlink 'have_stdckdint.exe'; # have_stdckdint.exe no longer needed
166-
}
167167
}
168168
}
169169

win32/configure/have_stdckdint.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
defined if and only if 'have_stdckdint.exe' prints '0'
77
when executed.
88
Else $Config{i_stdckdint} and I_STDCKDINT will be undef.
9-
10-
The stdckdint.h functionality should be available only if
11-
gcc version >= 14 && $Config{cc} is 'gcc'.
129
*/
1310

1411
#include <stdio.h>

0 commit comments

Comments
 (0)