Author: chromatic
Date: Sat Mar 29 14:30:01 2008
New Revision: 26633
Modified:
trunk/config/inter/make.pm
Log:
[config] Made configure favor make over nmake for Cygwin (Reini Urban, RT
#51898).
Modified: trunk/config/inter/make.pm
==============================================================================
--- trunk/config/inter/make.pm (original)
+++ trunk/config/inter/make.pm Sat Mar 29 14:30:01 2008
@@ -42,10 +42,10 @@
# check the candidates for a 'make' program in this order:
# environment ; option ; probe ; ask ; default
- # first pick wins.
+ # first pick wins. On cygwin prefer make over nmake.
$prog ||= $ENV{ uc($util) };
$prog ||= $conf->options->get($util);
- $prog ||= check_progs( ['gmake', 'mingw32-make', 'nmake', 'make'],
$verbose );
+ $prog ||= check_progs( $^O eq 'cygwin' ? ['gmake', 'make'] : ['gmake',
'mingw32-make', 'nmake', 'make'], $verbose );
if ( !$prog ) {
$prog = ( $conf->options->get('ask') )
? prompt( $prompt, $prog ? $prog : $conf->data->get($util) )
