X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/b75a7d8f3b4adbae880cab104ce2c6a50eee4db2..724c79ffa17a77cdef4b9590621d31d99a5a3745:/icuSources/config/mh-hpux-acc

diff --git a/icuSources/config/mh-hpux-acc b/icuSources/config/mh-hpux-acc
index e94ca432..f4c3e02c 100644
--- a/icuSources/config/mh-hpux-acc
+++ b/icuSources/config/mh-hpux-acc
@@ -1,9 +1,7 @@
 ## -*-makefile-*-
 ## HP/UX-specific setup using aCC
-## Copyright (c) 1999-2003, International Business Machines Corporation and
+## Copyright (c) 1999-2004, International Business Machines Corporation and
 ## others. All Rights Reserved.
-##
-## $Id: mh-hpux-acc,v 1.1.1.2 2003/07/03 18:13:33 avery Exp $
 
 ## Commands to generate dependency files
 GEN_DEPS.c=	:
@@ -13,6 +11,11 @@ GEN_DEPS.cc= 	:
 SHAREDLIBCFLAGS = +z
 SHAREDLIBCXXFLAGS = +z
 
+## Additional flags when building libraries with threads
+## We use this instead of -mt, which isn't available in all versions of aCC
+## Our tools won't compile with -D_POSIX_C_SOURCE=199506L
+THREADSCPPFLAGS = -D_REENTRANT -D_THREAD_SAFE
+
 # Use Extended ANSI mode, which is useful for 64-bit numbers
 # +Olibcalls uses intrinsic functions for strlen and others
 # +W ignores some warnings
@@ -20,8 +23,10 @@ SHAREDLIBCXXFLAGS = +z
 #    740 Unsafe cast between pointers/references to incomplete classes...
 #    749 This operation is non-portable and potentially unsafe.
 #        (Ironically the solution to fix this warning is non-portable)
+#    823 Redundant preprocessing concatenation operation results in two valid
+#        preprocessing tokens. This comes from INT64_C in <inttypes.h>
 CFLAGS += +Olibcalls -Ae +ESlit
-CXXFLAGS += +Olibcalls +W495 +W740 +W749
+CXXFLAGS += +Olibcalls +W495 +W740 +W749 +W823
 
 ## Commands to compile
 COMPILE.c=	$(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c
@@ -52,7 +57,11 @@ LD_RPATH_PRE=
 LDLIBRARYPATH_ENVVAR = SHLIB_PATH
 
 ## Compiler switch to embed a library name
-LD_SONAME = -Wl,+h,$(MIDDLE_SO_TARGET)
+LD_SONAME = -Wl,+h,$(notdir $(MIDDLE_SO_TARGET))
+
+## The type of assembly needed when pkgdata is used for generating shared libraries.
+# Commented out for now because the hp1 test machine runs out of memory.
+#GENCCODE_ASSEMBLY=-a aCC
 
 ## Shared object suffix
 SO=		sl
@@ -70,8 +79,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
@@ -85,9 +92,9 @@ 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) $@
 
 ## Install libraries as executable
 INSTALL-L=$(INSTALL_PROGRAM)