lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject [3/7] git commit: Search all of @INC for library files
Date Sun, 20 Jul 2014 18:56:08 GMT
Search all of @INC for library files

Needed to make the Lucy build work on Windows if Clownfish is
in a non-standard location.


Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/ab39208e
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/ab39208e
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/ab39208e

Branch: refs/heads/master
Commit: ab39208e6c06121c0678878ffd5acc2a39ae55bd
Parents: 8211411
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Sun Jul 20 16:59:41 2014 +0200
Committer: Marvin Humphrey <marvin@rectangular.com>
Committed: Sun Jul 20 19:54:48 2014 +0100

----------------------------------------------------------------------
 compiler/perl/lib/Clownfish/CFC/Perl/Build.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/ab39208e/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
----------------------------------------------------------------------
diff --git a/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm b/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
index 1b6c04f..dc1d285 100644
--- a/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
+++ b/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
@@ -144,10 +144,9 @@ sub cf_linker_flags {
     # Link against import library on MSVC
     my $ext          = $Config{cc} =~ /^cl\b/ ? 'lib' : $dlext;
 
-    for my $location ( qw( site vendor ) ) {
-        my $install_dir = $Config{"install${location}arch"};
+    for my $dir (@INC) {
         my $lib_file = catfile(
-            $install_dir, 'auto', @module_parts, "$class_name.$ext",
+            $dir, 'auto', @module_parts, "$class_name.$ext",
         );
         return ( $lib_file ) if -f $lib_file;
     }


Mime
View raw message