[csw-devel] SF.net SVN: gar:[17696] csw/mgar/gar/v2

[wilbury at users.sourceforge.net]

Revision: 17696
          http://gar.svn.sourceforge.net/gar/?rev=17696&view=rev
Author:   wilbury
Date:     2012-04-15 14:17:16 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
Removed warning on line 921. Requested by D. Michelsen.

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.conf.mk
    csw/mgar/gar/v2/gar.lib.mk
    csw/mgar/gar/v2/gar.mk

Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2012-04-15 13:53:45 UTC (rev 17695)
+++ csw/mgar/gar/v2/gar.conf.mk	2012-04-15 14:17:16 UTC (rev 17696)
@@ -293,7 +293,7 @@
     ARCHFLAGS_SOS12U2_sparcv8plus = -m32 -xarch=sparc
     ARCHFLAGS_SOS12U3_sparcv8plus = -m32 -xarch=sparc
        ARCHFLAGS_GCC3_sparcv8plus = -mcpu=v8 -mv8plus
-       ARCHFLAGS_GCC4_sparcv8plus = -mcpu=v8 -mv8plus
+       ARCHFLAGS_GCC4_sparcv8plus = -mcpu=v9
           MEMORYMODEL_sparcv8plus = 32
 
           ARCHFLAGS_SOS11_sparcv8 = -xarch=v8

Modified: csw/mgar/gar/v2/gar.lib.mk
===================================================================
--- csw/mgar/gar/v2/gar.lib.mk	2012-04-15 13:53:45 UTC (rev 17695)
+++ csw/mgar/gar/v2/gar.lib.mk	2012-04-15 14:17:16 UTC (rev 17696)
@@ -971,12 +971,12 @@
 # just run make install and hope for the best.
 install-%/Makefile:
 	@echo " ==> Running make install in $*"
-	@cd $* && /usr/bin/env -i $(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS) install
+	cd $* && /usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS) install
 	@$(MAKECOOKIE)
 
 install-%/makefile:
 	@echo " ==> Running make install in $*"
-	@cd $* && $(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS) install
+	@cd $* && $(INSTALL_ENV) /opt/csw/bin/gmake DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS) install
 	@$(MAKECOOKIE)
 
 install-%/GNUmakefile:

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2012-04-15 13:53:45 UTC (rev 17695)
+++ csw/mgar/gar/v2/gar.mk	2012-04-15 14:17:16 UTC (rev 17696)
@@ -918,7 +918,6 @@
 
 # This merges the 
 merge-modulated: install-modulated pre-merge-modulated pre-merge-$(MODULATION) $(MERGE_TARGETS) post-merge-$(MODULATION) post-merge-modulated
-	$(warning M: $(MERGE_DIRS))
 	@$(MAKECOOKIE)
 
 # Copy the whole tree verbatim

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.