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/lib/librt | |
| parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
| parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
| download | illumos-joyent-gcc9.tar.gz | |
mergegcc9
Diffstat (limited to 'usr/src/lib/librt')
| -rw-r--r-- | usr/src/lib/librt/Makefile | 1 | ||||
| -rw-r--r-- | usr/src/lib/librt/Makefile.com | 26 | ||||
| -rw-r--r-- | usr/src/lib/librt/amd64/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/lib/librt/i386/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/lib/librt/sparc/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/lib/librt/sparcv9/Makefile | 3 |
6 files changed, 33 insertions, 6 deletions
diff --git a/usr/src/lib/librt/Makefile b/usr/src/lib/librt/Makefile index 6cb7a4fa8a..ef1592a4a5 100644 --- a/usr/src/lib/librt/Makefile +++ b/usr/src/lib/librt/Makefile @@ -36,7 +36,6 @@ install := TARGET= install all clean clobber install: $(SUBDIRS) -lint: $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/librt/Makefile.com b/usr/src/lib/librt/Makefile.com index e2ca43b66d..2472527a6e 100644 --- a/usr/src/lib/librt/Makefile.com +++ b/usr/src/lib/librt/Makefile.com @@ -27,5 +27,29 @@ VERS = .1 include $(SRC)/lib/Makefile.rootfs -LIBS += $(LINTLIB) DYNFLAGS += -F libc.so.1 + +COMPATLINKS += lib/libposix4.so.1 \ + lib/libposix4.so \ + usr/lib/libposix4.so.1 \ + usr/lib/libposix4.so + +COMPATLINKS64 += lib/$(MACH64)/libposix4.so.1 \ + lib/$(MACH64)/libposix4.so \ + usr/lib/$(MACH64)/libposix4.so.1 \ + usr/lib/$(MACH64)/libposix4.so + +$(ROOT)/lib/libposix4.so.1 := COMPATLINKTARGET=librt.so.1 +$(ROOT)/lib/libposix4.so := COMPATLINKTARGET=libposix4.so.1 +$(ROOT)/usr/lib/libposix4.so.1 := COMPATLINKTARGET=../../lib/librt.so.1 +$(ROOT)/usr/lib/libposix4.so := COMPATLINKTARGET=../../lib/librt.so.1 +$(ROOT)/lib/$(MACH64)/libposix4.so.1 := COMPATLINKTARGET=librt.so.1 +$(ROOT)/lib/$(MACH64)/libposix4.so := COMPATLINKTARGET=libposix4.so.1 +$(ROOT)/usr/lib/$(MACH64)/libposix4.so.1:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/librt.so.1 +$(ROOT)/usr/lib/$(MACH64)/libposix4.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/librt.so.1 +$(ROOT)/usr/lib/$(MACH64)/librt.so.1:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/librt.so.1 +$(ROOT)/usr/lib/$(MACH64)/librt.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/librt.so.1 diff --git a/usr/src/lib/librt/amd64/Makefile b/usr/src/lib/librt/amd64/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/librt/amd64/Makefile +++ b/usr/src/lib/librt/amd64/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/librt/i386/Makefile b/usr/src/lib/librt/i386/Makefile index 4e4e8c02a9..682e5560ca 100644 --- a/usr/src/lib/librt/i386/Makefile +++ b/usr/src/lib/librt/i386/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/librt/sparc/Makefile b/usr/src/lib/librt/sparc/Makefile index 4e4e8c02a9..682e5560ca 100644 --- a/usr/src/lib/librt/sparc/Makefile +++ b/usr/src/lib/librt/sparc/Makefile @@ -26,6 +26,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/lib/librt/sparcv9/Makefile b/usr/src/lib/librt/sparcv9/Makefile index 70f0fc2457..7769ebb6b9 100644 --- a/usr/src/lib/librt/sparcv9/Makefile +++ b/usr/src/lib/librt/sparcv9/Makefile @@ -27,6 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ |