Add GCC_GNU_SHORT_TRIPLET for packages that use ...-solaris2 instead …

…of ...-solaris2.11

Python would like to use this in installed pathnames.  Inspired by
omniosorg/omnios-build#3492

make-rules/ips.mk

@@ -104,6 +104,7 @@ PKG_VARS += MACH MACH32 MACH64
 PKG_VARS += BUILD_VERSION OS_VERSION PKG_SOLARIS_VERSION
 PKG_VARS += GNU_TRIPLET
 PKG_VARS += GCC_GNU_TRIPLET
+PKG_VARS += GCC_GNU_SHORT_TRIPLET
 PKG_VARS += CONSOLIDATION
 PKG_VARS += COMPONENT_VERSION IPS_COMPONENT_VERSION HUMAN_VERSION
 PKG_VARS += COMPONENT_ARCHIVE_URL COMPONENT_PROJECT_URL COMPONENT_NAME
@@ -326,7 +327,8 @@ $(GENERATED).p5m:	install $(GENERATE_EXTRA_DEPS)
 	$(PKGMOGRIFY) $(PKG_OPTIONS) /dev/fd/0 $(GENERATE_TRANSFORMS) | \
 		$(GSED) -e '/^$$/d' -e '/^#.*$$/d' \
 			-e '/\.la$$/d' \
-			-e 's/$(subst .,\.,$(GCC_GNU_TRIPLET))/$$(GCC_GNU_TRIPLET)/g' | \
+			-e 's/$(subst .,\.,$(GCC_GNU_TRIPLET))/$$(GCC_GNU_TRIPLET)/g' \
+			-e 's/$(subst .,\.,$(GCC_GNU_SHORT_TRIPLET))/$$(GCC_GNU_SHORT_TRIPLET)/g' | \
 		$(PKGFMT) -u | \
 		uniq | \
 		$(PKGFMT) | \

make-rules/shared-macros.mk

@@ -650,6 +650,9 @@ FC.gcc.64 =	$(GCC_ROOT)/bin/gfortran
 GCC_FULL_VERSION = $(shell $(GCC_ROOT)/bin/gcc -dumpversion)
 # Since gcc-9 the GNU triplet is x86_64-pc-solaris2.11 instead of i386-pc-solaris2.11
 GCC_GNU_TRIPLET  = $(shell $(GCC_ROOT)/bin/gcc -dumpmachine)
+GCC_GNU_TRIPLET  = $(shell $(GCC_ROOT)/bin/gcc -dumpmachine)
+# GCC triplet with shorter version ( ..-solaris2 rather than ..-solaris2.11)
+GCC_GNU_SHORT_TRIPLET = $(shell $(GCC_ROOT)/bin/gcc -dumpmachine | /usr/bin/sed -E 's/\.[0-9]+$$//')
 GCC_BINDIR =	$(GCC_ROOT)/bin
 GCC_LIBDIR.32 =	$(GCC_ROOT)/lib
 GCC_LIBDIR.64 =	$(GCC_ROOT)/lib/$(MACH64)