From: Vincent Pit Date: Tue, 7 Apr 2015 16:06:30 +0000 (-0300) Subject: First try looking for the linker in the same directory as the compiler X-Git-Url: http://git.vpit.fr/?a=commitdiff_plain;h=a0fe58c410ccb7c3ebab821267cdafb5c561e316;p=perl%2Fmodules%2FScalar-Vec-Util.git First try looking for the linker in the same directory as the compiler --- diff --git a/Makefile.PL b/Makefile.PL index 1af2ae8..cd341ad 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -8,15 +8,22 @@ use Config; use File::Spec; sub validate_exe { - my ($name) = @_; + my ($name, $preferred_path) = @_; my (@candidates, @args); if (File::Spec->file_name_is_absolute($name)) { # No need to look for args if the name is absolute. @candidates = $name; } else { + my @path; + if (defined $preferred_path) { + @path = ($preferred_path, grep { $_ ne $preferred_path } File::Spec->path); + } else { + @path = File::Spec->path; + } + (my $base, @args) = split ' ', $name; - for my $path_entry (File::Spec->path) { + for my $path_entry (@path) { my ($vol, $dir, $file) = File::Spec->splitpath($path_entry, 1); next if defined $file and length $file; push @candidates, File::Spec->catpath($vol, $dir, $base); @@ -35,13 +42,13 @@ sub validate_exe { } sub check_exe { - my ($desc, $arg_var, $config_var, $env_var) = @_; + my ($desc, $arg_var, $config_var, $env_var, $preferred_path) = @_; my $exe; for (@ARGV) { if (/^\Q$arg_var\E=(.*)/) { - $exe = validate_exe($1); + $exe = validate_exe($1, $preferred_path); last if defined $exe; } } @@ -50,10 +57,10 @@ sub check_exe { print "Forcing the use of $exe as the $desc.\n"; } else { print "Checking for a valid $desc in the PATH... "; - $exe = validate_exe($Config{$config_var}); + $exe = validate_exe($Config{$config_var}, $preferred_path); # Only fall back to env if we cannot find the one used to build perl. if (not defined $exe and defined $ENV{$env_var}) { - $exe = validate_exe($ENV{$env_var}); + $exe = validate_exe($ENV{$env_var}, $preferred_path); } if (defined $exe) { print "$exe\n"; @@ -86,7 +93,9 @@ my ($cc, $ld); unless ($pp) { $cc = check_exe('C compiler', 'CC', 'cc', 'CC'); if (defined $cc) { - $ld = check_exe('linker', 'LD', 'ld', 'LD'); + my ($vol, $dir, $file) = File::Spec->splitpath($cc); + my $preferred_path = File::Spec->catpath($vol, $dir, ''); + $ld = check_exe('linker', 'LD', 'ld', 'LD', $preferred_path); } }