diff options
author | Zoltan Varga <vargaz@gmail.com> | 2008-08-28 19:53:21 +0400 |
---|---|---|
committer | Zoltan Varga <vargaz@gmail.com> | 2008-08-28 19:53:21 +0400 |
commit | b676a86903e925f3a33cadd0de6006a4a202d6c5 (patch) | |
tree | bc8570c40dd3ad4463de9268d14958f499f92a0a /mcs/build | |
parent | 3141b54bc0a7a93741f5c8f3565ac8ec7ef4daf8 (diff) |
2008-08-28 Zoltan Varga <vargaz@gmail.com>
* rules.make (Q_MCS): Use 5 spaces instead of -e '\\t'.
* library.make: Make some command quiet.
svn path=/trunk/mcs/; revision=111830
Diffstat (limited to 'mcs/build')
-rw-r--r-- | mcs/build/ChangeLog | 4 | ||||
-rw-r--r-- | mcs/build/library.make | 8 | ||||
-rw-r--r-- | mcs/build/rules.make | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog index aceb29e827b..02e23ab8f1b 100644 --- a/mcs/build/ChangeLog +++ b/mcs/build/ChangeLog @@ -1,5 +1,9 @@ 2008-08-28 Zoltan Varga <vargaz@gmail.com> + * rules.make (Q_MCS): Use 5 spaces instead of -e '\\t'. + + * library.make: Make some command quiet. + * rules.make: Avoid some needless recursive make invocations. * rules.make: Print the profile in the quiet commands. diff --git a/mcs/build/library.make b/mcs/build/library.make index 87f5e3d2cbd..7ff2937aaa1 100644 --- a/mcs/build/library.make +++ b/mcs/build/library.make @@ -94,7 +94,7 @@ ifdef NO_SIGN_ASSEMBLY SN = : else sn = $(topdir)/class/lib/net_1_1_bootstrap/sn.exe -SN = MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(sn) +SN = $(Q) MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(sn) SNFLAGS = -q -R endif @@ -297,9 +297,9 @@ $(build_lib): $(response) $(sn) $(BUILT_SOURCES) $(build_libdir:=/.stamp) ifdef LIBRARY_USE_INTERMEDIATE_FILE $(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) -target:library -out:$(LIBRARY_NAME) $(BUILT_SOURCES_cmdline) @$(response) $(SN) $(SNFLAGS) $(LIBRARY_NAME) $(LIBRARY_SNK) - mv $(LIBRARY_NAME) $@ - test ! -f $(LIBRARY_NAME).mdb || mv $(LIBRARY_NAME).mdb $@.mdb - test ! -f $(LIBRARY_NAME:.dll=.pdb) || mv $(LIBRARY_NAME:.dll=.pdb) $(dir $@)$(LIBRARY_NAME:.dll=.pdb) + $(Q) mv $(LIBRARY_NAME) $@ + $(Q) test ! -f $(LIBRARY_NAME).mdb || mv $(LIBRARY_NAME).mdb $@.mdb + $(Q) test ! -f $(LIBRARY_NAME:.dll=.pdb) || mv $(LIBRARY_NAME:.dll=.pdb) $(dir $@)$(LIBRARY_NAME:.dll=.pdb) else $(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) -target:library -out:$@ $(BUILT_SOURCES_cmdline) @$(response) $(SN) $(SNFLAGS) $@ $(LIBRARY_SNK) diff --git a/mcs/build/rules.make b/mcs/build/rules.make index 74de070b191..61a382309e6 100644 --- a/mcs/build/rules.make +++ b/mcs/build/rules.make @@ -16,7 +16,8 @@ topdir := $(dots) VERSION = 0.93 Q=$(if $(V),,@) -Q_MCS=$(if $(V),,@echo -e "MCS\\t[$(PROFILE)] $(notdir $(@))";) +# echo -e "\\t" does not work on some systems, so use 5 spaces +Q_MCS=$(if $(V),,@echo "MCS [$(PROFILE)] $(notdir $(@))";) USE_MCS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS) USE_MBAS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MBAS_FLAGS) $(PLATFORM_MBAS_FLAGS) $(PROFILE_MBAS_FLAGS) $(MBAS_FLAGS) |