Revision: 2623
http://gar.svn.sourceforge.net/gar/?rev=2623&view=rev
Author: dmichelsen
Date: 2008-12-16 18:48:14 +0000 (Tue, 16 Dec 2008)
Log Message:
-----------
mGAR v2: More generalized debug target 'modenv' instead of 'isaenv'
Modified Paths:
--------------
csw/mgar/gar/v2/gar.conf.mk
csw/mgar/gar/v2/gar.mk
Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk 2008-12-16 18:02:04 UTC (rev 2622)
+++ csw/mgar/gar/v2/gar.conf.mk 2008-12-16 18:48:14 UTC (rev 2623)
@@ -591,7 +591,7 @@
@echo " No = Compiler cannot generate code for that ISA"
@echo
-isaenv:
+modenv:
@echo " Arch: $(GARCH)"
@echo " Kernel: $(KERNELISA)"
@echo
@@ -610,13 +610,11 @@
@echo " Merge exclude: $(_MERGE_EXCLUDE_FILES)"
@echo
@echo "Requested compiler flags:"
- @$(foreach ISA,$(ISA) $(filter-out $(ISA),$(BUILD_ISAS)),
\
- $(MAKE) -s ISA=$(ISA) _isaenv;
\
- )
+ @$(foreach MOD,$(MODULATIONS),$(MAKE) -s _modenv-$(MOD);)
-_isaenv:
+_modenv-modulated:
@echo; \
- echo "* ISA $(ISA)"; \
+ echo "* Modulation $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M))";
\
echo " PATH = $(PATH)"; \
echo "PKG_CONFIG_PATH = $(PKG_CONFIG_PATH)"; \
echo " CFLAGS = $(CFLAGS)"; \
Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk 2008-12-16 18:02:04 UTC (rev 2622)
+++ csw/mgar/gar/v2/gar.mk 2008-12-16 18:48:14 UTC (rev 2623)
@@ -137,19 +137,27 @@
endef
+define _modulate_target_nocookie_noprepost
+$(1)-$(2):
+ @gmake -s MODULATION=$(2) $(3) $(1)-modulated
+ @# The next line has intentionally been left blank to explicitly
terminate this make rule
+
+endef
+
define _modulate_do
$(call _modulate_target,extract,$(2),$(4))
$(call _modulate_target,patch,$(2),$(4))
$(call _modulate_target,configure,$(2),$(4))
-$(call _modulate_target_nocookie,reset-configure,$(2),$(4))
+$(call _modulate_target_nocookie_noprepost,reset-configure,$(2),$(4))
$(call _modulate_target,build,$(2),$(4))
-$(call _modulate_target_nocookie,reset-build,$(2),$(4))
+$(call _modulate_target_nocookie_noprepost,reset-build,$(2),$(4))
$(call _modulate_target,test,$(2),$(4))
$(call _modulate_target,install,$(2),$(4))
-$(call _modulate_target_nocookie,reset-install,$(2),$(4))
+$(call _modulate_target_nocookie_noprepost,reset-install,$(2),$(4))
$(call _modulate_target,merge,$(2),$(4))
-$(call _modulate_target_nocookie,reset-merge,$(2),$(4))
-$(call _modulate_target_nocookie,clean,$(2),$(4))
+$(call _modulate_target_nocookie_noprepost,reset-merge,$(2),$(4))
+$(call _modulate_target_nocookie_noprepost,clean,$(2),$(4))
+$(call _modulate_target_nocookie_noprepost,_modenv,$(2),$(4))
endef
# This evaluates to the make rules for all modulations passed as first argument
@@ -186,10 +194,6 @@
$(eval $(call _modulate,$(MODULATORS)))
-modenv:
- @echo " Modulators: $(MODULATORS)"
- @echo "Modulations: $(MODULATIONS)"
- @echo "M: $(call expand_modulator_1,ISA)"
# ========================= MAIN RULES =========================
# The main rules are the ones that the user can specify as a
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
