Skip to content

Commit 639928c

Browse files
committed
Improve vpath support in plperl build
Run xsubpp with the -output option instead of redirecting stdout. That ensures that the #line directives in the output file point to the right place in a vpath build. This in turn fixes an error in coverage builds that it can't find the source files. Refactor the makefile rules while we're here. Reviewed-by: Michael Paquier <[email protected]>
1 parent 684cf76 commit 639928c

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

src/pl/plperl/GNUmakefile

+2-6
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,9 @@ perlchunks.h: $(PERLCHUNKS)
8181

8282
all: all-lib
8383

84-
SPI.c: SPI.xs plperl_helpers.h
84+
%.c: %.xs
8585
@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi
86-
$(PERL) $(XSUBPPDIR)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@
87-
88-
Util.c: Util.xs plperl_helpers.h
89-
@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi
90-
$(PERL) $(XSUBPPDIR)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@
86+
$(PERL) $(XSUBPPDIR)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap -output $@ $<
9187

9288

9389
install: all install-lib install-data

0 commit comments

Comments
 (0)