You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2016/06/14 11:59:59 UTC
[3/3] lucy-clownfish git commit: Fix Perl build without make
Fix Perl build without make
Compile all files in autogen/source if not building with make.
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/bb48393d
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/bb48393d
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/bb48393d
Branch: refs/heads/master
Commit: bb48393df71a89e3f06a556e691f61dce9cff0e0
Parents: d8f2361
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Tue Jun 14 13:56:49 2016 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Tue Jun 14 13:56:49 2016 +0200
----------------------------------------------------------------------
compiler/perl/lib/Clownfish/CFC/Perl/Build.pm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/bb48393d/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 7c522e7..ba83277 100644
--- a/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
+++ b/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
@@ -382,7 +382,10 @@ sub ACTION_compile_custom_xs {
push @$c_files, @{ $self->rscan_dir( $source_dir, qr/\.c$/ ) };
}
my $autogen_src_dir = catdir( $AUTOGEN_DIR, 'source' );
- push @$c_files, @{ $self->rscan_dir( $autogen_src_dir, qr/_perl\.c$/ ) };
+ my $autogen_regex = ( grep { /^$autogen_src_dir/ } @objects )
+ ? qr/_perl\.c$/ # Only compile *_perl.c files.
+ : qr/\.c$/;
+ push @$c_files, @{ $self->rscan_dir( $autogen_src_dir, $autogen_regex ) };
my $extra_cflags = $self->clownfish_params('cflags');
for my $c_file (@$c_files) {
my $o_file = $c_file;