22c22 < # Copyright 2008 Sun Microsystems, Inc. All rights reserved. --- > # Copyright 2009 Sun Microsystems, Inc. All rights reserved. 25d24 < # ident "%Z%%M% %I% %E% SMI" 42a42 > ROOTVARIANTDIR64= $(ROOTLIB64)/libc 58a59,64 > VARBLD_1= $(MACH:sparc=sparc) > VARBLD= $(VARBLD_1:i386=) > > VARBLD64_1= $(MACH:sparc=sparcv9) > VARBLD64= $(VARBLD64_1:i386=) > 60c66 < VAR1_BLDDIR = $(MACH)_$(VAR1) --- > VAR1_BLDDIR = $(MACH)_$(VAR1)/$(VARBLD) 62c68 < VAR2_BLDDIR = $(MACH)_$(VAR2) --- > VAR2_BLDDIR = $(MACH)_$(VAR2)/$(VARBLD) 64c70 < VAR3_BLDDIR = $(MACH)_$(VAR3) --- > VAR3_BLDDIR = $(MACH)_$(VAR3)/$(VARBLD) 65a72,74 > VAR1_DYNLIB64 = $(LIBRARY:%.a=%_$(VAR1).so$(VERS)) > VAR1_BLDDIR64 = $(MACH)_$(VAR1)/$(VARBLD64) > 67c76,77 < sparc_VARIANTS= --- > sparc_VARIANTS= $(VAR1) > sparcv9_VARIANTS= $(VAR1) 73c83 < VARIANT_SUBDIRS = $(VARIANTS:%=$(MACH)_%) --- > VARIANT_SUBDIRS = $(VARIANTS:%=$(MACH)_%/$(VARBLD)) 74a85,87 > VARIANTS64= $($(MACH64)_VARIANTS) > VARIANT_SUBDIRS64 = $(VARIANTS64:%=$(MACH)_%/$(VARBLD64)) > 82c95,96 < VARIANTLIBS= $(VARIANTS:%=$(MACH)_%/$(LIBBASENAME)_%.so.1) --- > VARIANTLIBS= $(VARIANTS:%=$(MACH)_%/$(VARBLD)/$(LIBBASENAME)_%.so.1) > VARIANTLIBS64= $(VARIANTS64:%=$(MACH)_%/$(VARBLD64)/$(LIBBASENAME)_%.so.1) 83a98 > ROOTVARIANTLIBS64= $(VARIANTS64:%=$(ROOTVARIANTDIR64)/$(LIBBASENAME)_%.so.1) 103a119,121 > $(ROOTVARIANTDIR64) := FILEMODE= 755 > $(ROOTVARIANTDIR64)/$(VAR1_DYNLIB64) := FILEMODE= 755 > 134c152 < lib64: $(MACHLIBS64) $(MACH64)/$(LIB_PIC) $(VARIANTLIBS) --- > lib64: $(MACHLIBS64) $(MACH64)/$(LIB_PIC) $(VARIANTLIBS64) 145a164,166 > $(VARIANTLIBS64): FRC > @cd $(@D); pwd; VERSION='$(VERSION)' $(MAKE) $(@F) > 159c180,181 < $(ROOTFS_LINTLIB64) --- > $(ROOTFS_LINTLIB64) \ > $(ROOTVARIANTLIBS64) 182a205,209 > $(ROOTVARIANTDIR64): $(ROOTLIB64) > $(INS.dir) > $(ROOTVARIANTDIR64)/%: $(ROOTVARIANTDIR64) $(VAR1_BLDDIR64)/% > $(INS.file) >