From a5e405e266d13ab9463d5e0460695cd88ebe4eac Mon Sep 17 00:00:00 2001 From: Mark Glines Date: Wed, 4 Feb 2009 09:26:04 -0800 Subject: [PATCH] Fix a couple of other things related to building with a parrot in parrot/. --- build/gen_objectref_pmc.pl | 4 +++- config/makefiles/root.in | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/gen_objectref_pmc.pl b/build/gen_objectref_pmc.pl index d00f43a6f1c..7c95a58c727 100644 --- a/build/gen_objectref_pmc.pl +++ b/build/gen_objectref_pmc.pl @@ -23,6 +23,8 @@ =head1 FUNCTIONS use strict; +use Parrot::Config; + # Get and check parameters. my ($template, $output) = @ARGV; unless ($template && $output) { @@ -36,7 +38,7 @@ =head1 FUNCTIONS my $template_contents = slurp($template); # Read v-tables list and get list of functions from it. -my $vtable_list = slurp('../../src/vtable.tbl'); +my $vtable_list = slurp($PConfig{build_dir}.'/src/vtable.tbl'); my @all_vtables = extract_matches($vtable_list, '(\w+)\\('); # Find v-table methods defined in the ObjectRef template and exclude diff --git a/config/makefiles/root.in b/config/makefiles/root.in index 4786e26f479..f028d04dba7 100644 --- a/config/makefiles/root.in +++ b/config/makefiles/root.in @@ -177,7 +177,7 @@ Test.pir: Test.pm perl6.pbc $(PARROT) $(PARROT_ARGS) perl6.pbc --target=pir --output=Test.pir Test.pm $(PMC_DIR)/objectref.pmc : $(PMC_DIR)/objectref_pmc.template build/gen_objectref_pmc.pl - $(PERL) build/gen_objectref_pmc.pl $(PMC_DIR)/objectref_pmc.template \ + $(PERL) -I$(BUILD_DIR)/lib build/gen_objectref_pmc.pl $(PMC_DIR)/objectref_pmc.template \ $(PMC_DIR)/objectref.pmc src/gen_grammar.pir: $(PERL6GRAMMAR) src/parser/grammar.pg src/parser/grammar-oper.pg