ICU-4280 Improve the z/OS ASCII support.
X-SVN-Rev: 16914
This commit is contained in:
parent
d31f339917
commit
db0f035859
@ -201,7 +201,7 @@ typedef unsigned int uint32_t;
|
|||||||
/* Character data types */
|
/* Character data types */
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
|
|
||||||
#if defined(OS390) || defined(OS400)
|
#if ((defined(OS390) && (!defined(__CHARSET_LIB) || !__CHARSET_LIB))) || defined(OS400)
|
||||||
# define U_CHARSET_FAMILY 1
|
# define U_CHARSET_FAMILY 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -103,8 +103,6 @@ IMPORT_LIB = $(basename $(notdir $(SO_TARGET)))$(IMPORT_LIB_EXT)
|
|||||||
MIDDLE_IMPORT_LIB = $(basename $(notdir $(MIDDLE_SO_TARGET)))$(IMPORT_LIB_EXT)
|
MIDDLE_IMPORT_LIB = $(basename $(notdir $(MIDDLE_SO_TARGET)))$(IMPORT_LIB_EXT)
|
||||||
FINAL_IMPORT_LIB = $(basename $(notdir $(FINAL_SO_TARGET)))$(IMPORT_LIB_EXT)
|
FINAL_IMPORT_LIB = $(basename $(notdir $(FINAL_SO_TARGET)))$(IMPORT_LIB_EXT)
|
||||||
|
|
||||||
## Shared object suffix (switch to dll for shared library build)
|
|
||||||
SO = dll
|
|
||||||
## Non-shared intermediate object suffix
|
## Non-shared intermediate object suffix
|
||||||
STATIC_O = o
|
STATIC_O = o
|
||||||
|
|
||||||
@ -146,6 +144,17 @@ LIBICUIO= $(top_builddir)/io/$(LIBICU)io$(ICULIBSUFFIX)$(SO_TARGET_VERSION).x
|
|||||||
LIBCTESTFW= $(top_builddir)/tools/ctestfw/$(LIBICU)test$(ICULIBSUFFIX)$(SO_TARGET_VERSION).x
|
LIBCTESTFW= $(top_builddir)/tools/ctestfw/$(LIBICU)test$(ICULIBSUFFIX)$(SO_TARGET_VERSION).x
|
||||||
LIBICUTOOLUTIL= $(top_builddir)/tools/toolutil/$(LIBICU)tu$(ICULIBSUFFIX)$(SO_TARGET_VERSION).x
|
LIBICUTOOLUTIL= $(top_builddir)/tools/toolutil/$(LIBICU)tu$(ICULIBSUFFIX)$(SO_TARGET_VERSION).x
|
||||||
|
|
||||||
|
ifneq (${ICUDATA_CHAR},e)
|
||||||
|
## We're in ASCII mode.
|
||||||
|
CFLAGS += -Wc,"ascii"
|
||||||
|
CXXFLAGS += -Wc,"ascii"
|
||||||
|
SO = so
|
||||||
|
else
|
||||||
|
## We're in EBCDIC mode.
|
||||||
|
## Shared object suffix
|
||||||
|
SO = dll
|
||||||
|
endif
|
||||||
|
|
||||||
## Special 390 rules
|
## Special 390 rules
|
||||||
|
|
||||||
## Build archive from object
|
## Build archive from object
|
||||||
|
@ -44,7 +44,8 @@ ICUDATA_DIR = @pkgicudatadir@/$(PACKAGE)$(ICULIBSUFFIX)/$(VERSION)
|
|||||||
|
|
||||||
ICUDATA_BASENAME_VERSION = $(ICUPREFIX)dt@LIB_VERSION_MAJOR@
|
ICUDATA_BASENAME_VERSION = $(ICUPREFIX)dt@LIB_VERSION_MAJOR@
|
||||||
ICUDATA_ENTRY_POINT = $(ICUDATA_BASENAME_VERSION)
|
ICUDATA_ENTRY_POINT = $(ICUDATA_BASENAME_VERSION)
|
||||||
ICUDATA_PLATFORM_NAME = $(ICUDATA_BASENAME_VERSION)@ICUDATA_CHAR@
|
ICUDATA_CHAR = @ICUDATA_CHAR@
|
||||||
|
ICUDATA_PLATFORM_NAME = $(ICUDATA_BASENAME_VERSION)$(ICUDATA_CHAR)
|
||||||
PKGDATA_LIBSTATICNAME = -L $(STATIC_PREFIX)$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)
|
PKGDATA_LIBSTATICNAME = -L $(STATIC_PREFIX)$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)
|
||||||
ifeq ($(strip $(PKGDATA_MODE)),)
|
ifeq ($(strip $(PKGDATA_MODE)),)
|
||||||
PKGDATA_MODE=@DATA_PACKAGING_MODE@
|
PKGDATA_MODE=@DATA_PACKAGING_MODE@
|
||||||
|
Loading…
Reference in New Issue
Block a user