ICU-9555 reinstate compiler shortening

X-SVN-Rev: 32364

diff --git a/icu4c/source/Makefile.in b/icu4c/source/Makefile.in
index b9fefceb48ca80d19cecf6a5b33d9472d2aa613b..2c3ae5dbb7517b363256234ff1ff71422bf891e6 100644 (file)
--- a/icu4c/source/Makefile.in
+++ b/icu4c/source/Makefile.in
@@ -154,7 +154,9 @@ clean-recursive-with-twist:
        $(MAKE) clean-recursive LOCAL_SUBDIRS='$(CLEAN_FIRST_SUBDIRS) $(filter-out $(CLEAN_FIRST_SUBDIRS),$(LOCAL_SUBDIRS))'
 
 all-local: $(srcdir)/configure $(LOCAL_BUILT_FILES) $(INSTALLED_BUILT_FILES)
-
+ifndef VERBOSE
+       @echo "Note: rebuild with \"$(MAKE) VERBOSE=1 $(MAKECMDGOALS)\" to show all compiler parameters."
+endif
 install-local: install-icu install-manx
 
 install-icu: $(INSTALLED_BUILT_FILES)

diff --git a/icu4c/source/config/mh-darwin b/icu4c/source/config/mh-darwin
index 6278955e075e76d004534e5335d8db92e20babd6..97d6bfc2d669d757fb6179ee0231c94978cba33c 100644 (file)
--- a/icu4c/source/config/mh-darwin
+++ b/icu4c/source/config/mh-darwin
@@ -54,14 +54,14 @@ MIDDLE_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR).$(SO)
 
 ## Compilation and dependency rules
 %.$(STATIC_O): $(srcdir)/%.c
-       $(strip $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS)) -MMD -MT "$*.d $*.o $*.$(STATIC_O)" -o $@ $<
+       $(call SILENT_COMPILE,$(strip $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS)) -MMD -MT "$*.d $*.o $*.$(STATIC_O)" -o $@ $<)
 %.o: $(srcdir)/%.c
-       $(strip $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS)) -MMD -MT "$*.d $*.o $*.$(STATIC_O)" -o $@ $<
+       $(call SILENT_COMPILE,$(strip $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS)) -MMD -MT "$*.d $*.o $*.$(STATIC_O)" -o $@ $<)
 
 %.$(STATIC_O): $(srcdir)/%.cpp
-       $(strip $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS)) -MMD -MT "$*.d $*.o $*.$(STATIC_O)" -o $@ $<
+       $(call SILENT_COMPILE,$(strip $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS)) -MMD -MT "$*.d $*.o $*.$(STATIC_O)" -o $@ $<)
 %.o: $(srcdir)/%.cpp
-       $(strip $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS)) -MMD -MT "$*.d $*.o $*.$(STATIC_O)" -o $@ $<
+       $(call SILENT_COMPILE,$(strip $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS)) -MMD -MT "$*.d $*.o $*.$(STATIC_O)" -o $@ $<)
 
 ## Versioned libraries rules
 

diff --git a/icu4c/source/icudefs.mk.in b/icu4c/source/icudefs.mk.in
index e7fb6959bcf2ac22b8a0006b3315db165ef6d107..b66852c46f74f375cff97543ba1a9e310183c2de 100644 (file)
--- a/icu4c/source/icudefs.mk.in
+++ b/icu4c/source/icudefs.mk.in
@@ -172,6 +172,22 @@ LINK.cc=      $(CXX) $(CXXFLAGS) $(LDFLAGS)
 SHLIB.c=      $(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS)
 SHLIB.cc=     $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS)
 
+# Do not show the large compiling arguments by default.
+# To use:
+# change
+#    $(CC) -o foo
+# to
+#    $(call SILENT_COMPILE,$(CC) -o foo)
+ifndef VERBOSE
+    SILENT_COMPILE=@echo "     $(notdir $(firstword $(1)))     ... " $< && $(1) || \
+                       ( echo "*** Failed compilation command follows: ----------------------------------------------------------" ; \
+                         echo "$(1)" ; \
+                         echo "--- ( rebuild with \"$(MAKE) VERBOSE=1 $(MAKECMDGOALS)\" to show all parameters ) --------" ; \
+                       false )
+else
+    SILENT_COMPILE=$(1)
+endif
+
 # Environment variable to set a runtime search path
 LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH