From aac270e4ba02d44b83396ec8e6b3d72d00b5c7e5 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Wed, 6 Jul 2011 17:08:39 +0000 Subject: [PATCH] ICU-5890 implement rpath3.patch from #5890 X-SVN-Rev: 30283 --- icu4c/source/config/mh-darwin | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/icu4c/source/config/mh-darwin b/icu4c/source/config/mh-darwin index c2dc3984245..d8e6d5ba0e5 100644 --- a/icu4c/source/config/mh-darwin +++ b/icu4c/source/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-2009 International Business Machines Corporation and +## Copyright (c) 1999-2011 International Business Machines Corporation and ## others. All Rights Reserved. ## Flags for position independent code @@ -25,11 +25,15 @@ 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