Skip to content
This repository was archived by the owner on Jun 1, 2023. It is now read-only.

Commit a7274d1

Browse files
committed
EUMM: fix Config.pm target for cperl
1 parent f342405 commit a7274d1

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

.git-rr-cache

Submodule .git-rr-cache updated 177 files

dist/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -462,10 +462,10 @@ MAN1PODS = ".$self->wraplist(sort keys %{$self->{MAN1PODS}})."
462462
MAN3PODS = ".$self->wraplist(sort keys %{$self->{MAN3PODS}})."
463463
";
464464

465-
465+
my $configdep = $Config{usecperl} ? 'Config_heavy.pl' : 'Config.pm';
466466
push @m, q{
467467
# Where is the Config information that we are using/depend on
468-
CONFIGDEP = $(PERL_ARCHLIBDEP)$(DFSEP)Config.pm $(PERL_INCDEP)$(DFSEP)config.h
468+
CONFIGDEP = $(PERL_ARCHLIBDEP)$(DFSEP)}.$configdep.q{ $(PERL_INCDEP)$(DFSEP)config.h
469469
} if -e $self->catfile( $self->{PERL_INC}, 'config.h' );
470470

471471

@@ -3028,17 +3028,18 @@ sub perldepend {
30283028
my($self) = shift;
30293029
my(@m);
30303030

3031-
my $make_config = $self->cd('$(PERL_SRC)', '$(MAKE) lib/Config.pm');
3031+
my $configdep = $Config{usecperl} ? 'Config_heavy.pl' : 'Config.pm';
3032+
my $make_config = $self->cd('$(PERL_SRC)', '$(MAKE) lib$(DFSEP)' . $configdep);
30323033

3033-
push @m, sprintf <<'MAKE_FRAG', $make_config if $self->{PERL_SRC};
3034+
push @m, sprintf <<'MAKE_FRAG', $configdep, $configdep, $make_config if $self->{PERL_SRC};
30343035
# Check for unpropogated config.sh changes. Should never happen.
30353036
# We do NOT just update config.h because that is not sufficient.
30363037
# An out of date config.h is not fatal but complains loudly!
30373038
$(PERL_INCDEP)/config.h: $(PERL_SRC)/config.sh
30383039
-$(NOECHO) $(ECHO) "Warning: $(PERL_INC)/config.h out of date with $(PERL_SRC)/config.sh"; $(FALSE)
30393040
3040-
$(PERL_ARCHLIB)/Config.pm: $(PERL_SRC)/config.sh
3041-
$(NOECHO) $(ECHO) "Warning: $(PERL_ARCHLIB)/Config.pm may be out of date with $(PERL_SRC)/config.sh"
3041+
$(PERL_ARCHLIB)/%s: $(PERL_SRC)/config.sh
3042+
$(NOECHO) $(ECHO) "Warning: $(PERL_ARCHLIB)/%s may be out of date with $(PERL_SRC)/config.sh"
30423043
%s
30433044
MAKE_FRAG
30443045

t/porting/customized.dat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ ExtUtils::MakeMaker dist/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 9765d225fe
5656
ExtUtils::MakeMaker dist/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm 76819099ea23505b590d76818ec9d8c5ec69b9bb
5757
ExtUtils::MakeMaker dist/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm c49b0fc30a30dd8af0d74fed15fb8d95b7c850f4
5858
ExtUtils::MakeMaker dist/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm 1e0b0023bdd29e6c4ab315c8be8cb3c09fdc134a
59-
ExtUtils::MakeMaker dist/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 420379b10bf7ecbec169a8047ebe27cc69e629be
59+
ExtUtils::MakeMaker dist/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 4a60b0e46812f49b4e2cedfb41030d30dec2a1f2
6060
ExtUtils::MakeMaker dist/ExtUtils-MakeMaker/t/basic.t 3cb8d7aca46f529dfe62f9c5ed57aee7940bd6ca
6161
ExtUtils::MakeMaker dist/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/NoXS.pm 371cdff1b2375017907cfbc9c8f4a31f5ad10582
6262
ExtUtils::MakeMaker dist/ExtUtils-MakeMaker/t/Liblist.t 9a3baf8a2c2281037f803b909d26e77a1bb099af

0 commit comments

Comments
 (0)