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/libc/Makefile | |
| 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/libc/Makefile')
| -rw-r--r-- | usr/src/lib/libc/Makefile | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/usr/src/lib/libc/Makefile b/usr/src/lib/libc/Makefile index 7853c742c5..831425ecfd 100644 --- a/usr/src/lib/libc/Makefile +++ b/usr/src/lib/libc/Makefile @@ -45,6 +45,7 @@ ROOTVARIANTDIR64= $(ROOTLIB64)/libc # include common library definitions include ../Makefile.lib +include ../Makefile.rootfs # # on some architectures, we build multiple libc variants @@ -92,7 +93,7 @@ $(BUILD64)SUBDIRS += $(MACH64) $(VARIANT_SUBDIRS64) LIBS = $(DYNLIB) -ROOTLIBS64= $(ROOTLIBDIR64)/$(DYNLIB) +ROOTLIBS64= $(ROOTLIB64)/$(DYNLIB) MACHLIBS64= $(MACH64)/$(DYNLIB) VARIANTLIBS= $(VARIANTS:%=$(MACH)_%/$(VARBLD)/$(LIBBASENAME)_%.so.1) VARIANTLIBS64= $(VARIANTS64:%=$(MACH)_%/$(VARBLD64)/$(LIBBASENAME)_%.so.1) @@ -110,8 +111,8 @@ CLOBBERFILES += THIRDPARTYLICENSE extract-copyright $(ROOTHDRDIR)/%: port/gen/% $(INS.file) -$(ROOTLIBDIR)/$(DYNLIB) := FILEMODE = 755 -$(ROOTLIBDIR64)/$(DYNLIB) := FILEMODE = 755 +$(ROOTLIB)/$(DYNLIB) := FILEMODE = 755 +$(ROOTLIB64)/$(DYNLIB) := FILEMODE = 755 $(ROOTFS_LIBDIR)/$(DYNLIB) := FILEMODE = 755 $(ROOTFS_LIBDIR64)/$(DYNLIB) := FILEMODE = 755 @@ -165,7 +166,9 @@ $($(MACH)_COMP): FRC install: all \ etc \ inslib32 \ - $(BUILD64) inslib64 + $(ROOTCOMPATLINKS) + +$(BUILD64)install: inslib64 $(ROOTCOMPATLINKS64) inslib32: $(ROOTFS_LIBS) $(ROOTFS_LINKS) $(ROOTVARIANTLIBS) @@ -177,15 +180,6 @@ all_h: $(MACH)/assym.h $(MACH64)/assym.h check: $(CHECKHDRS) -$(ROOTFS_LIB)/%: $(MACH)/% - $(INS.file) -$(ROOTFS_LIBDIR)/$(LIBLINKS): $(ROOTFS_LIBDIR)/$(LIBLINKS)$(VERS) - $(INS.liblink) -$(ROOTFS_LIB64)/%: $(MACH64)/% - $(INS.file) -$(ROOTFS_LIBDIR64)/$(LIBLINKS): $(ROOTFS_LIBDIR64)/$(LIBLINKS)$(VERS) - $(INS.liblink) - $(ROOTVARIANTDIR): $(ROOTLIB) $(INS.dir) $(ROOTVARIANTDIR)/%: $(ROOTVARIANTDIR) $(VAR1_BLDDIR)/% @@ -233,5 +227,6 @@ cscope.out tags: FRC $(XREF) -x $@ FRC: + # include MACH-specific library targets include ../Makefile.mach |