diff options
Diffstat (limited to 'usr/src/lib/libc/Makefile')
| -rw-r--r-- | usr/src/lib/libc/Makefile | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/usr/src/lib/libc/Makefile b/usr/src/lib/libc/Makefile index 9f2e51e4f7..ebc1338484 100644 --- a/usr/src/lib/libc/Makefile +++ b/usr/src/lib/libc/Makefile @@ -47,6 +47,7 @@ ROOTVARIANTDIR64= $(ROOTLIB64)/libc # include common library definitions include ../Makefile.lib +include ../Makefile.rootfs # # on some architectures, we build multiple libc variants @@ -94,7 +95,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) @@ -112,8 +113,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 @@ -167,7 +168,9 @@ $($(MACH)_COMP): FRC install: all \ etc \ inslib32 \ - $(BUILD64) inslib64 + $(ROOTCOMPATLINKS) + +$(BUILD64)install: inslib64 $(ROOTCOMPATLINKS64) inslib32: $(ROOTFS_LIBS) $(ROOTFS_LINKS) $(ROOTVARIANTLIBS) @@ -179,15 +182,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)/% @@ -211,7 +205,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint .PARALLEL: $(SUBDIRS) @@ -223,7 +216,6 @@ clobber: $(SUBDIRS) etc clobber_local clobber_local: $(RM) $(CLOBBERFILES) -lint: _msg: $(MSGDOMAIN) catalog @@ -237,5 +229,6 @@ cscope.out tags: FRC $(XREF) -x $@ FRC: + # include MACH-specific library targets include ../Makefile.mach |