[lucy-commits] svn commit: r1142374 - /incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl

[ma...@apache.org]

Author: marvin
Date: Sun Jul  3 04:22:13 2011
New Revision: 1142374

URL: http://svn.apache.org/viewvc?rev=1142374&view=rev
Log:
Default a var at construction time rather than later.

Modified:
    incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl

Modified: incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl?rev=1142374&r1=1142373&r2=1142374&view=diff
==============================================================================
--- incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl (original)
+++ incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl Sun Jul  3 04:22:13 2011
@@ -38,7 +38,7 @@ sub new {
         obj_ext      => $args{obj_ext},
         exe_ext      => $args{exe_ext},
         cc           => $args{cc},
-        extra_cflags => $args{extra_cflags},
+        extra_cflags => $args{extra_cflags} || '',
     }, $class;
 
     # Gather source paths, normalized for the target OS.
@@ -133,11 +133,10 @@ sub clean_rule_win {
 
 sub gen_makefile {
     my ( $self, %args ) = @_;
-    my ( $h_files, $c_files, $c_tests, $c_test_cases )
-        = @$self{qw( h_files c_files c_tests c_test_cases )};
+    my ( $h_files, $c_files, $c_tests, $c_test_cases, $extra_cflags )
+        = @$self{qw( h_files c_files c_tests c_test_cases extra_cflags )};
 
     # Derive chunks of Makefile content.
-    my $extra_cflags = $self->{extra_cflags} || '';
     my $progname = $self->execify('charmonize.c');
     my $c2o_rule = $self->c2o_rule;
     my $progname_link_command = $self->build_link_command(