We now have different GCC versions on Solaris 9 and Solaris 10 hosts. This
means, that we can't have a common OS-release-independent setting in GAR
that will work for both systems.

Perhaps we need something like this?

diff --git a/gar/v2/gar.conf.mk b/gar/v2/gar.conf.mk
index 6f3fc18..112cbdc 100644
--- a/gar/v2/gar.conf.mk
+++ b/gar/v2/gar.conf.mk
@@ -539,7 +539,9 @@ SOS12U1_CC_HOME ?= /opt/studio/sunstudio12.1
 SOS12U2_CC_HOME ?= /opt/solstudio12.2
 SOS12U3_CC_HOME ?= /opt/solarisstudio12.3

-   GCC4_VERSION ?= 4.6
+   GCC4_VERSION_5.9 ?= 4.6
+   GCC4_VERSION_5.10 ?= 4.7
+   GCC4_VERSION = $(GCC4_VERSION_$(GAROSREL))

      GCC3_CC ?= $(GCC3_CC_HOME)/bin/gcc
      GCC4_CC ?= $(GCC4_CC_HOME)/bin/gcc-$(GCC4_VERSION)

In “real life” we'd also need to handle the 5.11 case.

Maciej
_______________________________________________
maintainers mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/maintainers
.:: This mailing list's archive is public. ::.

Reply via email to