From fab44fed99a33ef41bf8a772969dac4650003dcf Mon Sep 17 00:00:00 2001
From: George Rhoten <grhoten@users.noreply.github.com>
Date: Wed, 10 Mar 2004 22:34:38 +0000
Subject: [PATCH] ICU-2242 Assembly generation updates

X-SVN-Rev: 14671
---
 icu4c/source/config/mh-solaris    | 5 ++++-
 icu4c/source/tools/pkgdata/make.c | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/icu4c/source/config/mh-solaris b/icu4c/source/config/mh-solaris
index a32a0563525..3a9567e382c 100644
--- a/icu4c/source/config/mh-solaris
+++ b/icu4c/source/config/mh-solaris
@@ -3,7 +3,7 @@
 ## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
-## $Id: mh-solaris,v 1.34 2004/03/10 17:57:36 grhoten-oss Exp $
+## $Id: mh-solaris,v 1.35 2004/03/10 22:34:38 grhoten-oss Exp $
 
 ## Flags for position independent code
 SHAREDLIBCFLAGS = -KPIC
@@ -74,7 +74,10 @@ STATIC_O = o
 	$(RM) $@ && ln -s $*.$(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
diff --git a/icu4c/source/tools/pkgdata/make.c b/icu4c/source/tools/pkgdata/make.c
index 3b6cf03d9c9..c97438289d4 100644
--- a/icu4c/source/tools/pkgdata/make.c
+++ b/icu4c/source/tools/pkgdata/make.c
@@ -343,7 +343,7 @@ void
 pkg_mak_writeAssemblyHeader(FileStream *f, const UPKGOptions *o)
 {
     T_FileStream_writeLine(f, "\n");
-    T_FileStream_writeLine(f, "ifneq ($(GENCCODE_ASSEMBLY),)\n");
+    T_FileStream_writeLine(f, "ifneq (strip $(GENCCODE_ASSEMBLY),)\n");
     T_FileStream_writeLine(f, "\n");
     T_FileStream_writeLine(f, "BASE_OBJECTS=$(NAME)_dat.o\n");
     T_FileStream_writeLine(f, "\n");