X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/48b980fed3435926e0b3a8d72ecb58be703a1c7a..729e4ab9bc6618bc3d8a898e575df7f4019e29ca:/icuSources/config/mh-solaris

diff --git a/icuSources/config/mh-solaris b/icuSources/config/mh-solaris
index 25bd8214..4b969b5b 100644
--- a/icuSources/config/mh-solaris
+++ b/icuSources/config/mh-solaris
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ## Solaris-specific setup using Sun's compilers
-## Copyright (c) 1999-2006, International Business Machines Corporation and
+## Copyright (c) 1999-2010, International Business Machines Corporation and
 ## others. All Rights Reserved.
 
 ## Flags for position independent code
@@ -12,6 +12,24 @@ SHAREDLIBCPPFLAGS = -DPIC
 GEN_DEPS.c=  $(CC) -xM $(DEFS) $(CPPFLAGS)
 GEN_DEPS.cc= $(CXX) -xM $(DEFS) $(CPPFLAGS)
 
+ifeq ($(UCLN_NO_AUTO_CLEANUP),0)
+# set up init point.
+UCLN_FINI =  ucln_fini$(TARGET_STUBNAME)_$(SO_TARGET_VERSION_MAJOR)$(ICULIBSUFFIXCNAME)
+CPPFLAGS_FINI = -DUCLN_FINI=$(UCLN_FINI)
+LDFLAGS_FINI = -zfiniarray=$(UCLN_FINI)
+
+CPPFLAGSICUUC += $(CPPFLAGS_FINI)
+LDFLAGSICUUC += $(LDFLAGS_FINI)
+CPPFLAGSICUIO += $(CPPFLAGS_FINI)
+LDFLAGSICUIO += $(LDFLAGS_FINI)
+CPPFLAGSICUI18N += $(CPPFLAGS_FINI)
+LDFLAGSICUI18N += $(LDFLAGS_FINI)
+CPPFLAGSCTESTFW += $(CPPFLAGS_FINI)
+LDFLAGSCTESTFW += $(LDFLAGS_FINI)
+
+# ICUUC, ICUIO, ICUI18N, CTESTFW
+endif
+
 # -mt means 'compiles and links a multithreaded program'
 THREADSCFLAGS += -mt
 THREADSCXXFLAGS += -mt
@@ -26,8 +44,8 @@ SHLIB.c=	$(CC) $(CFLAGS) $(LDFLAGS) -G
 SHLIB.cc=	$(CXX) $(CXXFLAGS) $(LDFLAGS) -G
 
 ## Compiler switch to embed a runtime search path
-LD_RPATH=	-R
-LD_RPATH_PRE=	
+LD_RPATH=       -R'$$'ORIGIN 
+LD_RPATH_PRE=   -R
 
 #LIBRARY_PATH_PREFIX=/usr/lib/lwp:
 
@@ -73,4 +91,8 @@ BIR_LDFLAGS=  -Wl,-M,$(NAME).map -Wl,-B,symbolic -Wl,-B,eliminate
 BIR_DEPS=   $(NAME).map
 endif
 
+## Remove shared library 's'
+STATIC_PREFIX_WHEN_USED = 
+STATIC_PREFIX = 
+
 ## End Solaris-specific setup