cvs commit: ponie write_makefile.pl

[email protected] (Nicholas Clark) 11 May 2005 14:27:21 -0000
Newsgroups perl.ponie.changes
Message-ID <[email protected]>
cvsuser     05/05/11 07:27:20

  Modified:    .        write_makefile.pl
  Log:
  Conditionally find parrot_config.o and place it in libponie.a
  
  Revision  Changes    Path
  1.14      +15 -1     ponie/write_makefile.pl
  
  Index: write_makefile.pl
  ===================================================================
  RCS file: /cvs/public/ponie/write_makefile.pl,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- write_makefile.pl	3 May 2005 10:55:34 -0000	1.13
  +++ write_makefile.pl	11 May 2005 14:27:20 -0000	1.14
  @@ -20,6 +20,20 @@
     lc join ' ', map "$_$ext", @_;
   }
   my $allobjs = join ' ', all ($Config{_o}, @allPMCs), "perl5pmcs$Config{_o}";
  +
  +{
  +  local (*FH, $/);
  +  my $f = "$parrotdir/Makefile";
  +  open FH, $f or die "Can't open $f: $!";
  +  my $d = <FH>;
  +  # This is a hack. The conditional bit will go once everyone has a newer
  +  # parrot.
  +  # The whole hardcoding of the parrot config object file will go when someone
  +  # (maybe me) comes up with a good way of doing it.
  +  $allobjs .= " $parrotdir/src/parrot_config$Config{_o}"
  +    unless index ($d, '$(SRC_DIR)/parrot_config$(O)') == -1;
  +}
  +
   my $alldumps = all (".dump", @allPMCs);
   my $allpmcs = all (".pmc", @allPMCs);