ICU-4901 Build 64-bit binaries on Windows x64.
The z/OS changes are from jitterbug 4688 X-SVN-Rev: 18732
This commit is contained in:
parent
93554211e4
commit
9b0465f473
51
icu4c/source/aclocal.m4
vendored
51
icu4c/source/aclocal.m4
vendored
@ -189,6 +189,27 @@ AC_DEFUN(AC_CHECK_64BIT_LIBS,
|
||||
ENABLE_64BIT_LIBS=no
|
||||
fi
|
||||
;;
|
||||
x86_64-*-cygwin)
|
||||
if test "$GCC" = yes; then
|
||||
if test -n "`$CXX -dumpspecs 2>&1 && $CC -dumpspecs 2>&1 | grep -v __LP64__`"; then
|
||||
ENABLE_64BIT_LIBS=yes
|
||||
else
|
||||
ENABLE_64BIT_LIBS=no
|
||||
fi
|
||||
else
|
||||
ENABLE_64BIT_LIBS=no
|
||||
OLD_CPPFLAGS="${CPPFLAGS}"
|
||||
OLD_LDFLAGS="${LDFLAGS}"
|
||||
CPPFLAGS="${CPPFLAGS} /DWIN64"
|
||||
LDFLAGS="${LDFLAGS} /MACHINE:AMD64"
|
||||
AC_TRY_RUN(int main(void) {return 0;},
|
||||
ENABLE_64BIT_LIBS=yes, ENABLE_64BIT_LIBS=no, ENABLE_64BIT_LIBS=no)
|
||||
if test "$ENABLE_64BIT_LIBS" = no; then
|
||||
CPPFLAGS="${OLD_CPPFLAGS}"
|
||||
LDFLAGS="${OLD_LDFLAGS}"
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
*-*-aix*|powerpc64-*-linux*)
|
||||
if test "$ac_cv_prog_gcc" = no; then
|
||||
# Note: Have not tested 64-bitness with gcc.
|
||||
@ -236,21 +257,21 @@ AC_DEFUN(AC_CHECK_64BIT_LIBS,
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
# *-*ibm-openedition*|*-*-os390*)
|
||||
# OLD_CFLAGS="${CFLAGS}"
|
||||
# OLD_CXXFLAGS="${CXXFLAGS}"
|
||||
# OLD_LDFLAGS="${LDFLAGS}"
|
||||
# CFLAGS="${CFLAGS} -Wc,lp64,expo"
|
||||
# CXXFLAGS="${CXXFLAGS} -Wc,lp64,expo"
|
||||
# LDFLAGS="${LDFLAGS} -Wl,lp64"
|
||||
# AC_TRY_RUN(int main(void) {return 0;},
|
||||
# ENABLE_64BIT_LIBS=yes, ENABLE_64BIT_LIBS=no, ENABLE_64BIT_LIBS=no)
|
||||
# if test "$ENABLE_64BIT_LIBS" = no; then
|
||||
# CFLAGS="${OLD_CFLAGS}"
|
||||
# CXXFLAGS="${OLD_CXXFLAGS}"
|
||||
# LDFLAGS="${OLD_LDFLAGS}"
|
||||
# fi
|
||||
# ;;
|
||||
*-*ibm-openedition*|*-*-os390*)
|
||||
OLD_CFLAGS="${CFLAGS}"
|
||||
OLD_CXXFLAGS="${CXXFLAGS}"
|
||||
OLD_LDFLAGS="${LDFLAGS}"
|
||||
CFLAGS="${CFLAGS} -Wc,lp64"
|
||||
CXXFLAGS="${CXXFLAGS} -Wc,lp64"
|
||||
LDFLAGS="${LDFLAGS} -Wl,lp64"
|
||||
AC_TRY_RUN(int main(void) {return 0;},
|
||||
ENABLE_64BIT_LIBS=yes, ENABLE_64BIT_LIBS=no, ENABLE_64BIT_LIBS=no)
|
||||
if test "$ENABLE_64BIT_LIBS" = no; then
|
||||
CFLAGS="${OLD_CFLAGS}"
|
||||
CXXFLAGS="${OLD_CXXFLAGS}"
|
||||
LDFLAGS="${OLD_LDFLAGS}"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
ENABLE_64BIT_LIBS=no
|
||||
;;
|
||||
|
9849
icu4c/source/configure
vendored
9849
icu4c/source/configure
vendored
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user