X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/b75a7d8f3b4adbae880cab104ce2c6a50eee4db2..374ca955a76ecab1204ca8bfa63ff9238d998416:/icuSources/config/mh-solaris

diff --git a/icuSources/config/mh-solaris b/icuSources/config/mh-solaris
index cf12e9cc..8f5d3043 100644
--- a/icuSources/config/mh-solaris
+++ b/icuSources/config/mh-solaris
@@ -1,9 +1,7 @@
 ## -*-makefile-*-
 ## Solaris-specific setup using Sun's workshop compilers
-## Copyright (c) 1999-2000, International Business Machines Corporation and
+## Copyright (c) 1999-2004, International Business Machines Corporation and
 ## others. All Rights Reserved.
-##
-## $Id: mh-solaris,v 1.1.1.1 2003/02/05 21:31:17 avery Exp $
 
 ## Flags for position independent code
 SHAREDLIBCFLAGS = -KPIC
@@ -18,8 +16,8 @@ GEN_DEPS.cc= $(CXX) -xM $(DEFS) $(CPPFLAGS)
 CPPFLAGS += -libmil
 
 # -mt means 'compiles and links a multithreaded program'
-CFLAGS += -mt
-CXXFLAGS += -mt
+THREADSCFLAGS += -mt
+THREADSCXXFLAGS += -mt
 
 ## Commands to link
 ## For Sun Workshop, use CC to link to bring in C++ runtime
@@ -35,7 +33,10 @@ LD_RPATH=	-R
 LD_RPATH_PRE=	
 
 ## Compiler switch to embed a library name
-LD_SONAME = -h $(MIDDLE_SO_TARGET)
+LD_SONAME = -h $(notdir $(MIDDLE_SO_TARGET))
+
+## The type of assembly needed when pkgdata is used for generating shared libraries.
+GENCCODE_ASSEMBLY=-a sun
 
 ## Shared object suffix
 SO=		so
@@ -53,8 +54,6 @@ STATIC_O = o
 %.o: $(srcdir)/%.cpp
 	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
 
-../data/%.o: ../data/%.c
-	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
 
 ## Dependency rules
 %.d : $(srcdir)/%.c
@@ -68,12 +67,15 @@ STATIC_O = o
 ## Versioned libraries rules
 
 %.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
-	$(RM) $@ && ln -s $< $@
+	$(RM) $@ && ln -s ${<F} $@
 %.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
-	$(RM) $@ && ln -s $*.$(SO).$(SO_TARGET_VERSION) $@
+	$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
 
 # 
+ifeq (strip $(GENCCODE_ASSEMBLY),)
 BIR_LDFLAGS=  -Wl,-M,$(NAME).map -Wl,-B,symbolic -Wl,-B,eliminate
 BIR_CPPFLAGS= -DU_HAVE_BIND_INTERNAL_REFERENCES
 BIR_DEPS=   $(NAME).map
+endif
+
 ## End Solaris-specific setup