Changeset 13224 for inc

Show
Ignore:
Timestamp:
09/12/06 13:44:54 (2 years ago)
Author:
audreyt
Message:

* GHC probing on Win32 now no longer fails when \ghc\unrelated-directory exists.
* Also allow installation of GHC directly inside \ghc\ to be probed.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • inc/Module/Install/Pugs.pm

    r13124 r13224  
    215215 
    216216            GHC_TEST: 
    217             for my $ghc_dir (sort @ghc_choices) { 
     217            for my $ghc_dir ($ghc_root, sort @ghc_choices) { 
    218218                my $ghc_candidate = qq/${ghc_dir}${slash}bin${slash}ghc.exe/; 
    219                 if ($ghc_version = $test_ghc_ver->($ghc_candidate)) { 
     219                if (my $ghc_candidate_version = $test_ghc_ver->($ghc_candidate)) { 
    220220                    $ghc = $ghc_candidate; 
     221                    $ghc_version = $ghc_candidate_version; 
    221222                } 
    222223            } 
    223             warn "*** Using GHC version: $ghc\n" if $ghc; 
     224            warn "*** Using GHC version: $ghc ($ghc_version)\n" if $ghc; 
    224225        } 
    225226    }