diff options
| author | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
|---|---|---|
| committer | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
| commit | 5b2acc0949194447bba6e45a0fa44d0b5f42f208 (patch) | |
| tree | 7ea9eb87bc68fee386dd39035ce715e87a0e673c /usr/src/cmd/sgs/liblddbg | |
| parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
| parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
| download | illumos-joyent-gcc9.tar.gz | |
mergegcc9
Diffstat (limited to 'usr/src/cmd/sgs/liblddbg')
| -rw-r--r-- | usr/src/cmd/sgs/liblddbg/Makefile.com | 7 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/liblddbg/amd64/Makefile | 7 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/liblddbg/i386/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/liblddbg/sparc/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/liblddbg/sparcv9/Makefile | 9 |
5 files changed, 10 insertions, 21 deletions
diff --git a/usr/src/cmd/sgs/liblddbg/Makefile.com b/usr/src/cmd/sgs/liblddbg/Makefile.com index c4b9f9d6db..16e864f0ec 100644 --- a/usr/src/cmd/sgs/liblddbg/Makefile.com +++ b/usr/src/cmd/sgs/liblddbg/Makefile.com @@ -53,8 +53,14 @@ OBJECTS = $(BLTOBJ) $(COMOBJS) $(COMOBJS32) $(COMOBJS64) $(SGSCOMMONOBJ) include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.rootfs include $(SRC)/cmd/sgs/Makefile.com +LIBS = $(DYNLIB) + +COMPATLINKS = usr/lib/$(DYNLIB) +COMPATLINKS64 = usr/lib/$(MACH64)/$(DYNLIB) + SRCDIR = $(SGSHOME)/liblddbg MAPFILEDIR = $(SRCDIR)/common @@ -85,4 +91,3 @@ LIBSRCS = $(COMOBJS:%.o=$(SRCDIR)/common/%.c) \ CLEANFILES += $(BLTFILES) CLOBBERFILES += $(DYNLIB) $(LIBLINKS) -ROOTFS_DYNLIB = $(DYNLIB:%=$(ROOTFS_LIBDIR)/%) diff --git a/usr/src/cmd/sgs/liblddbg/amd64/Makefile b/usr/src/cmd/sgs/liblddbg/amd64/Makefile index 1d0ab295e0..9783a0d400 100644 --- a/usr/src/cmd/sgs/liblddbg/amd64/Makefile +++ b/usr/src/cmd/sgs/liblddbg/amd64/Makefile @@ -26,11 +26,6 @@ include ../Makefile.com -ROOTFS_LIBDIR64 = \ - $(VAR_LIBLDDBG_64_ROOTFS_LIBDIR) -ROOTFS_DYNLIB64 = \ - $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) - CONVLIBDIR = $(CONVLIBDIR64) .KEEP_STATE: @@ -40,7 +35,7 @@ $(ROOTFS_DYNLIB64) := FILEMODE= 755 all: $(DYNLIB) $(LIBLINKS) install \ -package: all $(ROOTFS_DYNLIB64) +package: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ include ../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/liblddbg/i386/Makefile b/usr/src/cmd/sgs/liblddbg/i386/Makefile index d27ae308e3..4345c2ca64 100644 --- a/usr/src/cmd/sgs/liblddbg/i386/Makefile +++ b/usr/src/cmd/sgs/liblddbg/i386/Makefile @@ -23,8 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -33,6 +31,6 @@ include ../Makefile.com all: $(DYNLIB) $(LIBLINKS) install \ -package: all $(ROOTFS_DYNLIB) +package: all $(ROOTLIBS) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/liblddbg/sparc/Makefile b/usr/src/cmd/sgs/liblddbg/sparc/Makefile index d27ae308e3..4345c2ca64 100644 --- a/usr/src/cmd/sgs/liblddbg/sparc/Makefile +++ b/usr/src/cmd/sgs/liblddbg/sparc/Makefile @@ -23,8 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -33,6 +31,6 @@ include ../Makefile.com all: $(DYNLIB) $(LIBLINKS) install \ -package: all $(ROOTFS_DYNLIB) +package: all $(ROOTLIBS) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile b/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile index b57167b378..8bc19f5ce4 100644 --- a/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile +++ b/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile @@ -26,21 +26,14 @@ include ../Makefile.com -ROOTFS_LIBDIR64 = \ - $(VAR_LIBLDDBG_64_ROOTFS_LIBDIR) -ROOTFS_DYNLIB64 = \ - $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) - CONVLIBDIR = $(CONVLIBDIR64) .KEEP_STATE: -$(ROOTFS_DYNLIB64) := FILEMODE= 755 - all: $(DYNLIB) $(LIBLINKS) install \ -package: all $(ROOTFS_DYNLIB64) +package: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ include ../../Makefile.sub.64 |