summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Stormont <astormont@racktopsystems.com>2019-09-30 14:30:48 +0100
committerAndrew Stormont <astormont@racktopsystems.com>2019-09-30 20:49:05 +0100
commit90948640db5d93c4ddf069ea009faccb36fb16b0 (patch)
treeb03f07f8275983461105777c6307ba798b99f2f8
parent6caf82fa836a9721560a96669ccdd90b3fa7b644 (diff)
downloadillumos-joyent-90948640db5d93c4ddf069ea009faccb36fb16b0.tar.gz
11763 Build can't find perl on OI Hipster
Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Alexander Pyhalov <apyhalov@gmail.com> Reviewed by: John Levon <john.levon@joyent.com> Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk> Reviewed by: Peter Tribble <peter.tribble@gmail.com> Approved by: Dan McDonald <danmcd@joyent.com>
-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)