From f835d9c2078cb0a9b0cfbe81d9c3facd4885c256 Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Tue, 15 Mar 2005 18:20:10 +0000 Subject: [PATCH] ICU-4440 Fix confusing runConfigureICU platform names and descriptions. X-SVN-Rev: 17343 --- icu4c/source/runConfigureICU | 183 ++++++++++++++--------------------- 1 file changed, 72 insertions(+), 111 deletions(-) diff --git a/icu4c/source/runConfigureICU b/icu4c/source/runConfigureICU index e1986053dcd..2f327f89f8e 100755 --- a/icu4c/source/runConfigureICU +++ b/icu4c/source/runConfigureICU @@ -29,32 +29,27 @@ Options: -h, --help Print this message and exit The following names can be supplied as the argument for platform: - AIX4.3xlC Use IBM's xlC on AIX 4.3 - AIX4.3xlC_nothreads Use IBM's xlC on AIX 4.3 with no multithreading - AIX4.3VA Use IBM's Visual Age xlC_r compiler on AIX 4.3 - AIXGCC Use GCC on AIX - ALPHA/LINUXGCC Use GCC on Alpha/Linux systems - ALPHA/LINUXCCC Use Compaq C compiler on Alpha/Linux systems - BeOS Use the GNU C++ compiler on BeOS - Cygwin Use the GNU C++ compiler on Cygwin - Cygwin/MSVC Use the Microsoft Visual C++ compiler on Cygwin - FreeBSD Use the GNU C++ compiler on Free BSD - HP-UX11ACC Use the Advanced C++ compiler on HP-UX 11 - HP-UX11CC Use HP's C++ compiler on HP-UX 11 - LinuxRedHat Use the GNU C++ compiler on Linux - LINUX/ECC Use the Intel ECC compiler on Linux - LINUX/ICC Use the Intel ICC compiler on Linux - LINUX/VA Use IBM's Visual Age compiler on Power PC Linux - MacOSX Use the GNU C++ compiler on MacOS X (Darwin) - QNX Use QNX's QCC compiler on QNX/Neutrino - SOLARISCC Use Sun's CC compiler on Solaris - SOLARISCC/W4.2 Use Sun's Workshop 4.2 CC compiler on Solaris - SOLARISGCC Use the GNU C++ compiler on Solaris - SOLARISX86 Use Sun's CC compiler on Solaris x86 - TRU64V5.1/CXX Use Compaq's cxx compiler on Tru64 (OSF) - zOS Use IBM's cxx compiler on z/OS (os/390) - zOSV1R2 Use IBM's cxx compiler for z/OS 1.2 - OS390V2R10 Use IBM's cxx compiler for OS/390 2.10 + AIX Use the IBM Visual Age xlc_r/xlC_r compilers on AIX + AIX/GCC Use the GNU gcc/g++ compilers on AIX + BeOS Use the GNU gcc/g++ compilers on BeOS + Cygwin Use the GNU gcc/g++ compilers on Cygwin + Cygwin/MSVC Use the Microsoft Visual C++ compiler on Cygwin + FreeBSD Use the GNU gcc/g++ compilers on Free BSD + HP-UX/ACC Use the HP ANSI C/Advanced C++ compilers on HP-UX 11 + Linux Use the GNU gcc/g++ compilers on Linux + Linux/ECC Use the Intel ECC compiler on Linux + Linux/ICC Use the Intel ICC compiler on Linux + Linux/VA Use the IBM Visual Age compiler on Power PC Linux + MacOSX Use the GNU gcc/g++ compilers on MacOS X (Darwin) + QNX Use the QNX QCC compiler on QNX/Neutrino + Solaris Use the Sun cc/CC compilers on Solaris + Solaris/CCW4.2 Use the Sun Workshop 4.2 CC (old) compiler on Solaris + Solaris/GCC Use the GNU gcc/g++ compilers on Solaris + SolarisX86 Use the Sun cc/CC compilers on Solaris x86 + TRU64V5.1/CXX Use the Compaq cxx compiler on Tru64 (OSF) + zOS Use the IBM cxx compiler on z/OS (os/390) + zOSV1R2 Use the IBM cxx compiler for z/OS 1.2 + OS390V2R10 Use the IBM cxx compiler for OS/390 2.10 EOE fi @@ -126,41 +121,45 @@ then fi case $platform in - AIX4.3xlC) - THE_OS=AIX - THE_COMP="xlC_r" - CC=/usr/ibmcxx/bin/xlc_r; export CC - CXX=/usr/ibmcxx/bin/xlC_r; export CXX - RELEASE_CFLAGS="-O -qmaxmem=-1" - RELEASE_CXXFLAGS="-O -qmaxmem=-1" - ;; - AIX4.3xlC_nothreads) - THE_OS=AIX - THE_COMP="xlC" - CC=/usr/ibmcxx/bin/xlc; export CC - CXX=/usr/ibmcxx/bin/xlC; export CXX - AIX_SHLIB=/usr/ibmcxx/bin/makeC++SharedLib; export AIX_SHLIB - RELEASE_CFLAGS="-O -qmaxmem=-1" - RELEASE_CXXFLAGS="-O -qmaxmem=-1" - OPTS="$OPTS --enable-threads=no" - ;; - AIX4.3VA) + AIX) THE_OS=AIX THE_COMP="xlC_r" CC=`which xlc_r`; export CC CXX=`which xlC_r`; export CXX RELEASE_CFLAGS="-O2 -qmaxmem=-1" RELEASE_CXXFLAGS="-O2 -qmaxmem=-1" - #LDFLAGS=-L/usr/lpp/xlC/lib; export LDFLAGS ;; -# For no threads use --enable-threads=no. Visual Age makes no distinction between xlC and xlC_r or any other _r programs. - AIXGCC) + AIX/GCC) THE_OS=AIX THE_COMP="gcc" CC=`which gcc`; export CC CXX=`which g++`; export CXX ;; - SOLARISX86) + Solaris) + THE_OS=SOLARIS + THE_COMP="Sun's CC" + CC=`which cc`; export CC + CXX=`which CC`; export CXX + RELEASE_CFLAGS=-xO4 + RELEASE_CXXFLAGS=-O4 + ;; + Solaris/W4.2) + THE_OS=SOLARIS + THE_COMP="Sun's CC" + CC=`which cc`; export CC + CXX=`which CC`; export CXX + RELEASE_CFLAGS=-x04 + RELEASE_CXXFLAGS="-O4 +d" + ;; + Solaris/GCC) + THE_OS=SOLARIS + THE_COMP="the GNU C++" + CXXFLAGS="$CXXFLAGS -I/usr/local/include/g++"; export CXXFLAGS + LDFLAGS="$LDFLAGS -R/usr/local/lib"; export LDFLAGS + RELEASE_CXXFLAGS=-O + RELEASE_CFLAGS=-O3 + ;; + SolarisX86) THE_OS="SOLARIS X86" THE_COMP="Sun's CC" CC=`which cc`; export CC @@ -171,39 +170,7 @@ case $platform in RELEASE_CFLAGS=-xO3 RELEASE_CXXFLAGS=-O3 ;; - SOLARISCC) - THE_OS=SOLARIS - THE_COMP="Sun's CC" - CC=`which cc`; export CC - CXX=`which CC`; export CXX - RELEASE_CFLAGS=-xO4 - RELEASE_CXXFLAGS=-O4 - ;; - SOLARISCC/W4.2) - THE_OS=SOLARIS - THE_COMP="Sun's CC" - CC=`which cc`; export CC - CXX=`which CC`; export CXX - RELEASE_CFLAGS=-x04 - RELEASE_CXXFLAGS="-O4 +d" - ;; - SOLARISGCC) - THE_OS=SOLARIS - THE_COMP="the GNU C++" - CXXFLAGS="$CXXFLAGS -I/usr/local/include/g++"; export CXXFLAGS - LDFLAGS="$LDFLAGS -R/usr/local/lib"; export LDFLAGS - RELEASE_CXXFLAGS=-O - RELEASE_CFLAGS=-O3 - ;; - HP-UX11CC) - THE_OS="HP-UX 11" - THE_COMP="HP's CC" - CC=cc; export CC - CXX=CC; export CXX - RELEASE_CFLAGS='+O2 +Ofltacc' - RELEASE_CXXFLAGS='+O2 +Ofltacc' - ;; - HP-UX11ACC) + HP-UX/ACC) THE_OS="HP-UX 11" THE_COMP="aCC" CC=cc; export CC @@ -211,33 +178,7 @@ case $platform in RELEASE_CFLAGS='+O2 +Ofltacc' RELEASE_CXXFLAGS='+O2 +Ofltacc' ;; - TRU64V5.1/CXX) - THE_OS="OSF1" - THE_COMP="Compaq cxx" - CC=cc; export CC - CXX=cxx; export CXX - ;; - ALPHA/LINUXCCC) - THE_OS="Linux" - THE_COMP="Compaq's CC" - CC=ccc; export CC - CXX=cxx; export CXX - RELEASE_CFLAGS='-O4' - RELEASE_CXXFLAGS='-O4' - ;; - ALPHA/LINUXGCC) - THE_OS="Linux" - THE_COMP="the GNU C++" - CC=gcc; export CC - CXX=g++; export CXX - ;; - LinuxRedHat*) - THE_OS="Linux" - THE_COMP="the GNU C++" - CC=gcc; export CC - CXX=g++; export CXX - ;; - LINUX/ECC) + Linux/ECC) THE_OS="Linux" THE_COMP="Intel ECC 7.1" CC=ecc; export CC @@ -245,7 +186,7 @@ case $platform in RELEASE_CFLAGS='-O2' RELEASE_CXXFLAGS='-O2' ;; - LINUX/ICC) + Linux/ICC) THE_OS="Linux" THE_COMP="Intel ICC 6.0" CC=icc; export CC @@ -253,7 +194,7 @@ case $platform in RELEASE_CFLAGS='-O0' RELEASE_CXXFLAGS='-O0' ;; - LINUX/VA) + Linux/VA) THE_OS="Linux" THE_COMP="IBM Visual Age C++ Compiler" CC=`which xlc_r`; export CC @@ -261,6 +202,12 @@ case $platform in RELEASE_CFLAGS="-O2 -qmaxmem=-1" RELEASE_CXXFLAGS="-O2 -qmaxmem=-1" ;; + Linux*) + THE_OS="Linux" + THE_COMP="the GNU C++" + CC=gcc; export CC + CXX=g++; export CXX + ;; Cygwin) THE_OS="Cygwin" THE_COMP="the GNU C++" @@ -290,6 +237,20 @@ case $platform in CC=gcc; export CC CXX=g++; export CXX ;; + TRU64V5.1/CXX) + THE_OS="OSF1" + THE_COMP="Compaq cxx" + CC=cc; export CC + CXX=cxx; export CXX + ;; +# ALPHA/LINUXCCC) +# THE_OS="Linux" +# THE_COMP="Compaq's CC" +# CC=ccc; export CC +# CXX=cxx; export CXX +# RELEASE_CFLAGS='-O4' +# RELEASE_CXXFLAGS='-O4' +# ;; QNX) THE_OS="QNX" THE_COMP="QNX cc"