summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2019-09-30 15:04:49 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2019-09-30 15:04:49 +0000
commitae44c1df3a1e5ae3cabdddd67abd8aa021e4e1b6 (patch)
treed99c8ee3ed692757ef76647f493fd0c0040fc6f6
parent0e76c6c0a22a418e6815894dabbb9e27852646b1 (diff)
downloadillumos-joyent-ae44c1df3a1e5ae3cabdddd67abd8aa021e4e1b6.tar.gz
7661 illumos should provide 64bit perl modules [fix broken build]
-rw-r--r--usr/src/cmd/perl/Makefile.perl9
1 files changed, 7 insertions, 2 deletions
diff --git a/usr/src/cmd/perl/Makefile.perl b/usr/src/cmd/perl/Makefile.perl
index 823c2d048d..654b288914 100644
--- a/usr/src/cmd/perl/Makefile.perl
+++ b/usr/src/cmd/perl/Makefile.perl
@@ -25,6 +25,11 @@ PERLINCDIR = $(PERLLIBDIR)/CORE
PERLLIBDIR64 = $(PERLDIR)/lib/$(PERL_ARCH64)
PERLINCDIR64 = $(PERLLIBDIR64)/CORE
+PERLBINDIR = $(PERLDIR)/bin
+PERLBINDIR64 = $(PERLDIR)/bin
+$(BUILDPERL64)PERLBINDIR = $(PERLDIR)/bin/$(MACH)
+$(BUILDPERL32)PERLBINDIR64 = $(PERLDIR)/bin/$(MACH64)
+
PERLMOD = $(MODULE).pm
PERLEXT = $(MACH)/$(MODULE).so
PERLEXT64 = $(MACH64)/$(MODULE).so
@@ -42,9 +47,9 @@ ROOTPERLEXT = $(ROOTPERLEXTDIR)/$(MODULE).so
ROOTPERLMOD64 = $(ROOTPERLMODDIR64)/$(MODULE).pm
ROOTPERLEXT64 = $(ROOTPERLEXTDIR64)/$(MODULE).so
-XSUBPP = $(PERLDIR)/bin/$(MACH)/perl $(PERLDIR)/lib/ExtUtils/xsubpp \
+XSUBPP = $(PERLBINDIR)/perl $(PERLDIR)/lib/ExtUtils/xsubpp \
-typemap $(PERLDIR)/lib/ExtUtils/typemap
-XSUBPP64 = $(PERLDIR)/bin/$(MACH64)/perl $(PERLDIR)/lib/ExtUtils/xsubpp \
+XSUBPP64 = $(PERLBINDIR64)/perl $(PERLDIR)/lib/ExtUtils/xsubpp \
-typemap $(PERLDIR)/lib/ExtUtils/typemap
CSTD = $(CSTD_GNU99)