ICU-9555 reinstate compiler shortening
X-SVN-Rev: 32364
This commit is contained in:
parent
0e48356c32
commit
da2afe3e0e
@ -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)
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user