X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/374ca955a76ecab1204ca8bfa63ff9238d998416..b331163bffd790ced0e88b73f44f86d49ccc48a5:/icuSources/config/mh-darwin diff --git a/icuSources/config/mh-darwin b/icuSources/config/mh-darwin index e536afc8..97d6bfc2 100644 --- a/icuSources/config/mh-darwin +++ b/icuSources/config/mh-darwin @@ -1,7 +1,7 @@ ## -*-makefile-*- ## Darwin-specific setup (Darwin is the Mac OS X developer preview, successor ## to Rhapsody, aka Mac OS X Server) -## Copyright (c) 1999-2004, International Business Machines Corporation and +## Copyright (c) 1999-2012 International Business Machines Corporation and ## others. All Rights Reserved. ## Flags for position independent code @@ -9,27 +9,34 @@ SHAREDLIBCFLAGS = -dynamic SHAREDLIBCXXFLAGS = -dynamic SHAREDLIBCPPFLAGS = +# Do not export internal methods by default +LIBCFLAGS += -fvisibility=hidden +LIBCXXFLAGS += -fvisibility=hidden + # Pad out the paths to the maximum possible length LD_FLAGS += -headerpad_max_install_names -## Commands to generate dependency files -GEN_DEPS.c= $(CC) -E -MMD $(DEFS) $(CPPFLAGS) -GEN_DEPS.cc= $(CXX) -E -MMD $(DEFS) $(CPPFLAGS) +# We do not need to see the stderr message that the archive was made. +ARFLAGS += -c ## Commands to compile COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -fno-common -c COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -fno-common -c ## Commands to make a shared library -SHLIB.c= $(CC) -dynamiclib -dynamic $(CFLAGS) $(LDFLAGS) -SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) +SHLIB.c= $(CC) -dynamiclib -dynamic $(CFLAGS) $(LDFLAGS) $(LD_SOOPTIONS) +SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS) ## Compiler switches to embed a library name and version information +ifeq ($(ENABLE_RPATH),YES) +LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) +else LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) +endif ## Compiler switch to embed a runtime search path LD_RPATH= -LD_RPATH_PRE= +LD_RPATH_PRE= -Wl,-rpath, ## Environment variable to set a runtime search path LDLIBRARYPATH_ENVVAR = DYLD_LIBRARY_PATH @@ -41,40 +48,36 @@ SO= dylib ## Non-shared intermediate object suffix STATIC_O = ao -## Compilation rules +## Override Versioned target for a shared library. +FINAL_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO) +MIDDLE_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR).$(SO) + +## Compilation and dependency rules %.$(STATIC_O): $(srcdir)/%.c - $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< + $(call SILENT_COMPILE,$(strip $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS)) -MMD -MT "$*.d $*.o $*.$(STATIC_O)" -o $@ $<) %.o: $(srcdir)/%.c - $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $< + $(call SILENT_COMPILE,$(strip $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS)) -MMD -MT "$*.d $*.o $*.$(STATIC_O)" -o $@ $<) %.$(STATIC_O): $(srcdir)/%.cpp - $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $< + $(call SILENT_COMPILE,$(strip $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS)) -MMD -MT "$*.d $*.o $*.$(STATIC_O)" -o $@ $<) %.o: $(srcdir)/%.cpp - $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $< - - -## Dependency rules -%.d : $(srcdir)/%.c - @echo "generating dependency information for $<" - @$(GEN_DEPS.c) $< > /dev/null - @mv $@ $@~ - @echo -n "$@ " > $@ - @cat < $@~ >> $@ - @-rm $@~ - -%.d : $(srcdir)/%.cpp - @echo "generating dependency information for $<" - @$(GEN_DEPS.cc) $< >/dev/null - @mv $@ $@~ - @echo -n "$@ " > $@ - @cat < $@~ >> $@ - @-rm $@~ + $(call SILENT_COMPILE,$(strip $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS)) -MMD -MT "$*.d $*.o $*.$(STATIC_O)" -o $@ $<) ## Versioned libraries rules -%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) +%.$(SO_TARGET_VERSION_MAJOR).$(SO): %.$(SO_TARGET_VERSION).$(SO) $(RM) $@ && ln -s ${