Skip to content

Commit c59c493

Browse files
avargitster
authored andcommitted
perl: regenerate perl.mak if perl -V changes
Change the perl/perl.mak build process so that the file is regenerated if the output of "perl -V" changes. Before this change updating e.g. /usr/bin/perl to a new major version would cause the next "make" command to fail, since perl.mak has hardcoded paths to perl library paths retrieved from its first run. Now the logic added in commit ee9be06 ("perl: detect new files in MakeMaker builds", 2012-07-27) is extended to regenerate perl/perl.mak if there's any change to "perl -V". This will in some cases redundantly trigger perl/perl.mak to be re-made, e.g. if @inc is modified in ways the build process doesn't care about through sitecustomize.pl, but the common case is that we just do the right thing and re-generate perl/perl.mak when needed. Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 3b9e3c2 commit c59c493

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1837,6 +1837,7 @@ perl/perl.mak: perl/PM.stamp
18371837

18381838
perl/PM.stamp: FORCE
18391839
@$(FIND) perl -type f -name '*.pm' | sort >$@+ && \
1840+
$(PERL_PATH) -V >>$@+ && \
18401841
{ cmp $@+ $@ >/dev/null 2>/dev/null || mv $@+ $@; } && \
18411842
$(RM) $@+
18421843

0 commit comments

Comments
 (0)