Revision: 2480
http://gar.svn.sourceforge.net/gar/?rev=2480&view=rev
Author: dmichelsen
Date: 2008-12-09 09:13:56 +0000 (Tue, 09 Dec 2008)
Log Message:
-----------
mGAR v2: Fix CC_HOME and CC_VERSION
Modified Paths:
--------------
csw/mgar/gar/v2/gar.conf.mk
Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk 2008-12-09 09:00:16 UTC (rev 2479)
+++ csw/mgar/gar/v2/gar.conf.mk 2008-12-09 09:13:56 UTC (rev 2480)
@@ -374,25 +374,21 @@
GCC4_AS_FLAGS ?= $(EXTRA_GCC4_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS)
$(EXTRA_AS_FLAGS)
SOS11_AS_FLAGS ?= $(EXTRA_SOS11_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS)
$(EXTRA_AS_FLAGS)
SOS12_AS_FLAGS ?= $(EXTRA_SOS12_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS)
$(EXTRA_AS_FLAGS)
-GCC3_LD_FLAGS ?= -L$(GNU_CC_HOME)/lib $(ARCHFLAGS_$(GARCOMPILER)_$(ISA))
$(EXTRA_GCC3_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS)
-GCC4_LD_FLAGS ?= -L$(GNU_CC_HOME)/lib $(ARCHFLAGS_$(GARCOMPILER)_$(ISA))
$(EXTRA_GCC4_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS)
+GCC3_LD_FLAGS ?= -L$(GCC3_CC_HOME)/lib $(ARCHFLAGS_$(GARCOMPILER)_$(ISA))
$(EXTRA_GCC3_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS)
+GCC4_LD_FLAGS ?= -L$(GCC4_CC_HOME)/lib $(ARCHFLAGS_$(GARCOMPILER)_$(ISA))
$(EXTRA_GCC4_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS)
SOS11_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_LD_FLAGS)
$(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS)
SOS12_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_LD_FLAGS)
$(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS)
# Compiler version
-GCC_CC_VERSION = $(shell $(CC_HOME)/bin/gcc -v 2>&1| ggrep version)
-GCC_CXX_VERSION = $(CC_VERSION)
-GCC3_CC_VERSION = $(GCC_CC_VERSION)
-GCC3_CXX_VERSION = $(GCC_CXX_VERSION)
-GCC4_CC_VERSION = $(GCC_CC_VERSION)
-GCC4_CXX_VERSION = $(GCC_CXX_VERSION)
+GCC3_CC_VERSION = $(shell $(GCC3_CC) -v 2>&1| ggrep version)
+GCC3_CXX_VERSION = $(shell $(GCC3_CXX) -v 2>&1| ggrep version)
+GCC4_CC_VERSION = $(shell $(GCC4_CC) -v 2>&1| ggrep version)
+GCC4_CXX_VERSION = $(shell $(GCC4_CXX) -v 2>&1| ggrep version)
-SOS_CC_VERSION = $(shell $(CC_HOME)/bin/cc -V 2>&1| ggrep cc: | gsed -e
's/cc: //')
-SOS_CXX_VERSION = $(shell $(CC_HOME)/bin/CC -V 2>&1| ggrep CC: | gsed -e
's/CC: //')
-SOS11_CC_VERSION = $(SOS_CC_VERSION)
-SOS11_CXX_VERSION = $(SOS_CXX_VERSION)
-SOS12_CC_VERSION = $(SOS_CC_VERSION)
-SOS12_CXX_VERSION = $(SOS_CXX_VERSION)
+SOS11_CC_VERSION = $(shell $(SOS11_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //')
+SOS11_CXX_VERSION = $(shell $(SOS11_CXX)/bin/CC -V 2>&1| ggrep CC: | gsed -e
's/CC: //')
+SOS12_CC_VERSION = $(shell $(SOS11_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //')
+SOS12_CXX_VERSION = $(shell $(SOS11_CXX)/bin/CC -V 2>&1| ggrep CC: | gsed -e
's/CC: //')
CC_VERSION = $($(GARCOMPILER)_CC_VERSION)
CXX_VERSION = $($(GARCOMPILER)_CXX_VERSION)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
