summaryrefslogtreecommitdiff
path: root/usr/src/cmd
diff options
context:
space:
mode:
authorDan McDonald <danmcd@omniti.com>2015-02-09 10:59:49 -0500
committerDan McDonald <danmcd@omniti.com>2015-02-09 15:40:43 -0500
commit1f2ca518aeecee8616fccc0c46a339773faea7d5 (patch)
treec51a65e16aedade17eebfb7b83af74255eba9cb7 /usr/src/cmd
parent386e9c9ebfe4116f62e7a0950acd30564fc60125 (diff)
downloadillumos-gate-1f2ca518aeecee8616fccc0c46a339773faea7d5.tar.gz
4863 illumos-gate can't be built with fresh perl versions
Reviewed by: Andy Stormont <AStormont@racktopsystems.com> Reviewed by: Hans Rosenfeld <hans.rosenfeld@nexenta.com> Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net> Approved by: ???
Diffstat (limited to 'usr/src/cmd')
-rw-r--r--usr/src/cmd/perl/Makefile.perl8
-rw-r--r--usr/src/cmd/perl/Makefile.targ6
2 files changed, 6 insertions, 8 deletions
diff --git a/usr/src/cmd/perl/Makefile.perl b/usr/src/cmd/perl/Makefile.perl
index 3ee32fef0f..25fdc53f50 100644
--- a/usr/src/cmd/perl/Makefile.perl
+++ b/usr/src/cmd/perl/Makefile.perl
@@ -10,17 +10,15 @@
#
#
# Copyright (c) 2014 Racktop Systems.
+# Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved.
#
include $(SRC)/lib/Makefile.lib
-# PERL_VERSION used to be set here,
-# but as it is also needed in usr/src/pkg/Makefile,
+# PERL_VERSION and PERL_ARCH used to be set here,
+# but as they were also needed in usr/src/pkg/Makefile,
# the definition was moved to usr/src/Makefile.master
-PERL_ARCH = i86pc-solaris-64int
-$(SPARC_BLD)PERL_ARCH = sun4-solaris-64int
-
PERLDIR = $(ADJUNCT_PROTO)/usr/perl5/$(PERL_VERSION)
PERLLIBDIR = $(PERLDIR)/lib/$(PERL_ARCH)
PERLINCDIR = $(PERLLIBDIR)/CORE
diff --git a/usr/src/cmd/perl/Makefile.targ b/usr/src/cmd/perl/Makefile.targ
index a3211dff7f..b3f5ec9bd3 100644
--- a/usr/src/cmd/perl/Makefile.targ
+++ b/usr/src/cmd/perl/Makefile.targ
@@ -10,7 +10,7 @@
#
#
# Copyright (c) 2014 Racktop Systems.
-# Copyright 2014, OmniTI Computer Consulting, Inc. All rights reserved.
+# Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved.
#
# Link against libc as perl solaris specs
@@ -23,8 +23,8 @@ $(ROOTPERLEXT) := FILEMODE = 0555
$(ROOTPERLMOD) := FILEMODE = 0444
# CFLAGS for perl, specifically.
-PCFLAGS= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DPERL_USE_SAFE_PUTENV \
- -D_TS_ERRNO
+PCFLAGS= -DPERL_EUPXS_ALWAYS_EXPORT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
+ -DPERL_USE_SAFE_PUTENV -D_TS_ERRNO
$(MACH):
$(INS.dir)