AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-9456 Apparently C and C++ generate the dependencies differently. Update the .d generation accordingly.

Browse Source 
X-SVN-Rev: 32144
This commit is contained in:
George Rhoten 2012-08-09 22:36:57 +00:00
parent 091464430b
commit 81a751e0d2
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
icu4c/source/config/mh-darwin
View File

@ -51,11 +51,9 @@ STATIC_O = ao
# Make sure that both the static and dynamic intermediate objects
# get dependency checking
ifneq ($(ENABLE_STATIC),)
ifneq ($(ENABLE_DYNAMIC),)
STATIC_DEPENDENCY_FILE=" $*.$(STATIC_O)"
endif
DYNAMIC_DEPENDENCY_FILE=" $*.o"
endif
endif
## Override Versioned target for a shared library.
FINAL_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO)
@ -63,14 +61,14 @@ MIDDLE_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR).$(SO)
## Compilation and dependency rules
%.$(STATIC_O): $(srcdir)/%.c
$(SILENT_COMPILE)$(strip $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS)) -MMD -MT "$*.d$(DYNAMIC_DEPENDENCY_FILE)" -o $@ $<
$(SILENT_COMPILE)$(strip $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS)) -MMD -MT "$*.d"$(DYNAMIC_DEPENDENCY_FILE) -o $@ $<
%.o: $(srcdir)/%.c
$(SILENT_COMPILE)$(strip $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS)) -MMD -MT "$*.d$(STATIC_DEPENDENCY_FILE)" -o $@ $<
$(SILENT_COMPILE)$(strip $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS)) -MMD -MT "$*.d"$(STATIC_DEPENDENCY_FILE) -o $@ $<
%.$(STATIC_O): $(srcdir)/%.cpp
$(SILENT_COMPILE)$(strip $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS)) -MMD -MT "$*.d$(DYNAMIC_DEPENDENCY_FILE)" -o $@ $<
$(SILENT_COMPILE)$(strip $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS)) -MMD -MT "$*.d"$(DYNAMIC_DEPENDENCY_FILE)$(STATIC_DEPENDENCY_FILE) -o $@ $<
%.o: $(srcdir)/%.cpp
$(SILENT_COMPILE)$(strip $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS)) -MMD -MT "$*.d$(STATIC_DEPENDENCY_FILE)" -o $@ $<
$(SILENT_COMPILE)$(strip $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS)) -MMD -MT "$*.d"$(DYNAMIC_DEPENDENCY_FILE)$(STATIC_DEPENDENCY_FILE) -o $@ $<
## Versioned libraries rules