[svn:parrot] r36497 - trunk/lib/Parrot

[particle at svn.parrot.org]

Author: particle
Date: Mon Feb  9 17:56:20 2009
New Revision: 36497
URL: https://trac.parrot.org/parrot/changeset/36497

Log:
[lib] fix some indentation-challenged logic, and correct a broken case for ccache with msvc

Modified:
   trunk/lib/Parrot/Test.pm

Modified: trunk/lib/Parrot/Test.pm
==============================================================================
--- trunk/lib/Parrot/Test.pm	Mon Feb  9 17:48:41 2009	(r36496)
+++ trunk/lib/Parrot/Test.pm	Mon Feb  9 17:56:20 2009	(r36497)
@@ -961,15 +961,18 @@
                 my $iculibs = $PConfig{has_icu} ? $PConfig{icu_shared} : q{};
                 my $libparrot =
                     $PConfig{parrot_is_shared}
-                    ? ("$PConfig{rpath_blib} " .
-                      (($^O =~ m/MSWin32/ and $PConfig{cc} eq 'cl')
-                         ? "" : "-L$PConfig{blib_dir} "))
-                    . (
-                      $^O =~ m/MSWin32/
-                    ? $PConfig{libparrot_ldflags}
-                    : "-lparrot"
-                    )
-                    : File::Spec->join( $PConfig{blib_dir}, $PConfig{libparrot_static} );
+                      ? ("$PConfig{rpath_blib} "
+                        . (($^O =~ m/MSWin32/ and $PConfig{cc} =~ /\bcl\b/)
+                          ? ""
+                          : "-L$PConfig{blib_dir} "))
+                        . ($^O =~ m/MSWin32/
+                          ? File::Spec->join(
+                              @PConfig{qw/build_dir libparrot_ldflags/},
+                          )
+                          : "-lparrot")
+                      : File::Spec->join(
+                          @PConfig{qw/build_dir blib_dir libparrot_static/},
+                      );
                 my $cmd =
                       "$PConfig{link} $PConfig{linkflags} $PConfig{ld_debug} "
                     . "$obj_f $cfg $PConfig{ld_out}$exe_f "