diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2019-07-04 01:48:24 +0000 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2020-05-04 16:57:13 -0400 |
| commit | cd61ae21816e53b94bc1673f3f1aa651fc3115e8 (patch) | |
| tree | 58f0148e78b6ea4e2e3d64cc45641c9f62d4e574 /usr/src/lib/crt | |
| parent | 241c90a06e8d1708235651863df515a2d522a03a (diff) | |
| download | illumos-joyent-cd61ae21816e53b94bc1673f3f1aa651fc3115e8.tar.gz | |
12447 should install library compat symlinks from library makefiles, not Targetdirs
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Robert Mustacchi <rm@fingolfin.org>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/lib/crt')
| -rw-r--r-- | usr/src/lib/crt/Makefile.com | 36 | ||||
| -rw-r--r-- | usr/src/lib/crt/amd64/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/crt/i386/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/crt/sparc/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/crt/sparcv9/Makefile | 2 |
5 files changed, 39 insertions, 5 deletions
diff --git a/usr/src/lib/crt/Makefile.com b/usr/src/lib/crt/Makefile.com index 8415cf0cbe..70e5794cd0 100644 --- a/usr/src/lib/crt/Makefile.com +++ b/usr/src/lib/crt/Makefile.com @@ -59,6 +59,39 @@ $(COMMON_CRT) $(VALUES) := CFLAGS64 += $(C_PICFLAGS64) # intentional double exit SMOFF += unreachable +COMPATLINKS= usr/ccs/lib/values-Xa.o \ + usr/ccs/lib/values-Xc.o \ + usr/ccs/lib/values-Xs.o \ + usr/ccs/lib/values-Xt.o \ + usr/ccs/lib/values-xpg4.o \ + usr/ccs/lib/values-xpg6.o + +COMPATLINKS64= usr/ccs/lib/$(MACH64)/values-Xa.o \ + usr/ccs/lib/$(MACH64)/values-Xc.o \ + usr/ccs/lib/$(MACH64)/values-Xs.o \ + usr/ccs/lib/$(MACH64)/values-Xt.o \ + usr/ccs/lib/$(MACH64)/values-xpg4.o \ + usr/ccs/lib/$(MACH64)/values-xpg6.o + +$(ROOT)/usr/ccs/lib/values-Xa.o:= COMPATLINKTARGET=../../lib/values-Xa.o +$(ROOT)/usr/ccs/lib/values-Xc.o:= COMPATLINKTARGET=../../lib/values-Xc.o +$(ROOT)/usr/ccs/lib/values-Xs.o:= COMPATLINKTARGET=../../lib/values-Xs.o +$(ROOT)/usr/ccs/lib/values-Xt.o:= COMPATLINKTARGET=../../lib/values-Xt.o +$(ROOT)/usr/ccs/lib/values-xpg4.o:= COMPATLINKTARGET=../../lib/values-xpg4.o +$(ROOT)/usr/ccs/lib/values-xpg6.o:= COMPATLINKTARGET=../../lib/values-xpg6.o +$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xa.o:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/values-Xa.o +$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xc.o:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/values-Xc.o +$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xs.o:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/values-Xs.o +$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xt.o:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/values-Xt.o +$(ROOT)/usr/ccs/lib/$(MACH64)/values-xpg4.o:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/values-xpg4.o +$(ROOT)/usr/ccs/lib/$(MACH64)/values-xpg6.o:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/values-xpg6.o + .KEEP_STATE: all: $(OBJECTS) @@ -95,4 +128,5 @@ $(ROOTLIB64)/%.o: %.o $(ROOTLIB64)/gcrt1.o: $(RM) $(ROOTLIB64)/gcrt1.o; $(SYMLINK) crt1.o $(ROOTLIB64)/gcrt1.o -FRC: +$(ROOTCOMPATLINKS) $(ROOTCOMPATLINKS64): + $(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@ diff --git a/usr/src/lib/crt/amd64/Makefile b/usr/src/lib/crt/amd64/Makefile index 16967b67ff..1b252c9d3a 100644 --- a/usr/src/lib/crt/amd64/Makefile +++ b/usr/src/lib/crt/amd64/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: $(ROOTOBJECTS64) +install: $(ROOTOBJECTS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/crt/i386/Makefile b/usr/src/lib/crt/i386/Makefile index 5affa893b7..ddd4fa11af 100644 --- a/usr/src/lib/crt/i386/Makefile +++ b/usr/src/lib/crt/i386/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: $(ROOTOBJECTS) +install: $(ROOTOBJECTS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/crt/sparc/Makefile b/usr/src/lib/crt/sparc/Makefile index 5affa893b7..ddd4fa11af 100644 --- a/usr/src/lib/crt/sparc/Makefile +++ b/usr/src/lib/crt/sparc/Makefile @@ -26,4 +26,4 @@ include ../Makefile.com -install: $(ROOTOBJECTS) +install: $(ROOTOBJECTS) $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/crt/sparcv9/Makefile b/usr/src/lib/crt/sparcv9/Makefile index 16967b67ff..1b252c9d3a 100644 --- a/usr/src/lib/crt/sparcv9/Makefile +++ b/usr/src/lib/crt/sparcv9/Makefile @@ -27,4 +27,4 @@ include ../Makefile.com include ../../Makefile.lib.64 -install: $(ROOTOBJECTS64) +install: $(ROOTOBJECTS64) $(ROOTCOMPATLINKS64) |