ICU-5764 Test Windows x64 builds with Visual Studio 2005 standard edition.
X-SVN-Rev: 22138
This commit is contained in:
parent
e189493581
commit
0e9fd2f00e
13
icu4c/source/aclocal.m4
vendored
13
icu4c/source/aclocal.m4
vendored
@ -200,7 +200,7 @@ AC_DEFUN(AC_CHECK_64BIT_LIBS,
|
||||
ENABLE_64BIT_LIBS=no
|
||||
fi
|
||||
;;
|
||||
x86_64-*-cygwin)
|
||||
*-*-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
|
||||
@ -209,18 +209,13 @@ AC_DEFUN(AC_CHECK_64BIT_LIBS,
|
||||
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}"
|
||||
else
|
||||
ARFLAGS="${ARFLAGS} /MACHINE:AMD64"
|
||||
fi
|
||||
LDFLAGS="${OLD_LDFLAGS}"
|
||||
dnl These flags aren't required.
|
||||
dnl vcvarsamd64.bat should have been used to enable 64-bit builds.
|
||||
fi
|
||||
;;
|
||||
*-*-aix*|powerpc64-*-linux*)
|
||||
|
13
icu4c/source/configure
vendored
13
icu4c/source/configure
vendored
@ -3072,7 +3072,7 @@ echo $ECHO_N "checking for 64-bit executable support... $ECHO_C" >&6
|
||||
ENABLE_64BIT_LIBS=no
|
||||
fi
|
||||
;;
|
||||
x86_64-*-cygwin)
|
||||
*-*-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
|
||||
@ -3081,9 +3081,7 @@ echo $ECHO_N "checking for 64-bit executable support... $ECHO_C" >&6
|
||||
fi
|
||||
else
|
||||
ENABLE_64BIT_LIBS=no
|
||||
OLD_CPPFLAGS="${CPPFLAGS}"
|
||||
OLD_LDFLAGS="${LDFLAGS}"
|
||||
CPPFLAGS="${CPPFLAGS} /DWIN64"
|
||||
LDFLAGS="${LDFLAGS} /MACHINE:AMD64"
|
||||
if test "$cross_compiling" = yes; then
|
||||
ENABLE_64BIT_LIBS=no
|
||||
@ -3118,13 +3116,8 @@ ENABLE_64BIT_LIBS=no
|
||||
fi
|
||||
rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
if test "$ENABLE_64BIT_LIBS" = no; then
|
||||
CPPFLAGS="${OLD_CPPFLAGS}"
|
||||
LDFLAGS="${OLD_LDFLAGS}"
|
||||
else
|
||||
ARFLAGS="${ARFLAGS} /MACHINE:AMD64"
|
||||
fi
|
||||
fi
|
||||
LDFLAGS="${OLD_LDFLAGS}"
|
||||
fi
|
||||
;;
|
||||
*-*-aix*|powerpc64-*-linux*)
|
||||
if test "$ac_cv_c_compiler_gnu" = no; then
|
||||
|
Loading…
Reference in New Issue
Block a user