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/librtld | |
| parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
| parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
| download | illumos-joyent-gcc9.tar.gz | |
mergegcc9
Diffstat (limited to 'usr/src/cmd/sgs/librtld')
| -rw-r--r-- | usr/src/cmd/sgs/librtld/Makefile.com | 8 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/librtld/amd64/Makefile | 5 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/librtld/i386/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/librtld/sparc/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/librtld/sparcv9/Makefile | 5 |
5 files changed, 10 insertions, 12 deletions
diff --git a/usr/src/cmd/sgs/librtld/Makefile.com b/usr/src/cmd/sgs/librtld/Makefile.com index e15980f956..54ed7d31c3 100644 --- a/usr/src/cmd/sgs/librtld/Makefile.com +++ b/usr/src/cmd/sgs/librtld/Makefile.com @@ -38,8 +38,14 @@ OBJECTS= $(BLTOBJ) $(MACHOBJS) $(COMOBJS) 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 = ../common CPPFLAGS += -I../../rtld/common -I$(SRC)/lib/libc/inc \ -I$(SRC)/uts/common/krtld -I$(SRC)/common/sgsrtcid \ @@ -68,5 +74,3 @@ MSGSRCS= $(MACHOBJS:%.o=%.c) $(COMOBJS:%.o=../common/%.c) \ CLEANFILES += $(BLTFILES) CLOBBERFILES += $(DYNLIB) $(LIBLINKS) - -ROOTFS_DYNLIB= $(DYNLIB:%=$(ROOTFS_LIBDIR)/%) diff --git a/usr/src/cmd/sgs/librtld/amd64/Makefile b/usr/src/cmd/sgs/librtld/amd64/Makefile index ad8c67f0db..481b1c0a22 100644 --- a/usr/src/cmd/sgs/librtld/amd64/Makefile +++ b/usr/src/cmd/sgs/librtld/amd64/Makefile @@ -30,12 +30,9 @@ CPPFLAGS += -I../../../../uts/intel/amd64/krtld .KEEP_STATE: -ROOTFS_DYNLIB64 = $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) -$(ROOTFS_DYNLIB64) := FILEMODE=755 - all: $(DYNLIB) $(LIBLINKS) -install: all $(ROOTFS_DYNLIB64) +install: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) CPPFLAGS += -D_ELF64 diff --git a/usr/src/cmd/sgs/librtld/i386/Makefile b/usr/src/cmd/sgs/librtld/i386/Makefile index 54e5e30586..5d9e11a226 100644 --- a/usr/src/cmd/sgs/librtld/i386/Makefile +++ b/usr/src/cmd/sgs/librtld/i386/Makefile @@ -32,6 +32,6 @@ CPPFLAGS += -I../../../../uts/intel/ia32/krtld all: $(DYNLIB) $(LIBLINKS) -install: all $(ROOTFS_DYNLIB) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) include $(SRC)/cmd/sgs/librtld/Makefile.targ diff --git a/usr/src/cmd/sgs/librtld/sparc/Makefile b/usr/src/cmd/sgs/librtld/sparc/Makefile index ac07f8b8c0..eb5a2547e4 100644 --- a/usr/src/cmd/sgs/librtld/sparc/Makefile +++ b/usr/src/cmd/sgs/librtld/sparc/Makefile @@ -32,6 +32,6 @@ CPPFLAGS += -I../../../../uts/sparc/krtld all: $(DYNLIB) $(LIBLINKS) -install: all $(ROOTFS_DYNLIB) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) include $(SRC)/cmd/sgs/librtld/Makefile.targ diff --git a/usr/src/cmd/sgs/librtld/sparcv9/Makefile b/usr/src/cmd/sgs/librtld/sparcv9/Makefile index 00a9c3ca48..fd02c33926 100644 --- a/usr/src/cmd/sgs/librtld/sparcv9/Makefile +++ b/usr/src/cmd/sgs/librtld/sparcv9/Makefile @@ -30,12 +30,9 @@ CPPFLAGS += -I../../../../uts/sparc/krtld .KEEP_STATE: -ROOTFS_DYNLIB64 = $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) -$(ROOTFS_DYNLIB64) := FILEMODE=755 - all: $(DYNLIB) $(LIBLINKS) -install: all $(ROOTFS_DYNLIB64) +install: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) CPPFLAGS += -D_ELF64 |