Index: source/runConfigureICU |
diff --git a/source/runConfigureICU b/source/runConfigureICU |
index 8b2509c97994eaef24338c059e9728a98e0241b8..700122789fca3e30f42a9b51108edaf705c6298c 100755 |
--- a/source/runConfigureICU |
+++ b/source/runConfigureICU |
@@ -1,5 +1,5 @@ |
#!/bin/sh |
-# Copyright (c) 1999-2013, International Business Machines Corporation and |
+# Copyright (c) 1999-2014, International Business Machines Corporation and |
# others. All Rights Reserved. |
# runConfigureICU: This script will run the "configure" script for the appropriate platform |
@@ -40,7 +40,7 @@ The following names can be supplied as the argument for platform: |
Cygwin/MSVC Use the Microsoft Visual C++ compiler on Cygwin |
Cygwin/MSVC2005 Use the Microsoft Visual C++ 2005 compiler on Cygwin |
Cygwin/ICL Use the Intel C++ compiler on Cygwin |
- FreeBSD Use the GNU gcc/g++ compilers on Free BSD |
+ FreeBSD Use the clang/clang++ or GNU gcc/g++ compilers on FreeBSD |
HP-UX/ACC Use the HP ANSI C/Advanced C++ compilers on HP-UX 11 |
IBMi Use the iCC compilers on IBM i, i5/OS, OS/400 |
Linux Use the clang/clang++ or GNU gcc/g++ compilers on Linux |
@@ -51,6 +51,7 @@ The following names can be supplied as the argument for platform: |
MacOSX Use the default compilers on MacOS X (Darwin) |
MacOSX/GCC Use the GNU gcc/g++ compilers on MacOSX (Darwin) |
MinGW Use the GNU gcc/g++ compilers on MinGW |
+ MSYS/MSVC Use the Microsoft Visual C++ computer on MSYS |
QNX Use the QNX QCC compiler on QNX/Neutrino |
Solaris Use the Sun cc/CC compilers on Solaris |
Solaris/GCC Use the GNU gcc/g++ compilers on Solaris |
@@ -260,11 +261,11 @@ case $platform in |
THE_COMP="Microsoft Visual C++" |
CC=cl; export CC |
CXX=cl; export CXX |
- RELEASE_CFLAGS='/Gy /MD' |
- RELEASE_CXXFLAGS='/Gy /MD' |
- DEBUG_CFLAGS='/Zi /MDd' |
- DEBUG_CXXFLAGS='/Zi /MDd' |
- DEBUG_LDFLAGS='/DEBUG' |
+ RELEASE_CFLAGS='-Gy -MD' |
+ RELEASE_CXXFLAGS='-Gy -MD' |
+ DEBUG_CFLAGS='-Zi -MDd' |
+ DEBUG_CXXFLAGS='-Zi -MDd' |
+ DEBUG_LDFLAGS='-DEBUG' |
;; |
Cygwin/MSVC2005) |
THE_OS="Windows with Cygwin" |
@@ -304,8 +305,8 @@ case $platform in |
RELEASE_CXXFLAGS='-O2' |
DEBUG_CFLAGS='-g -O0' |
DEBUG_CXXFLAGS='-g -O0' |
- CC=gcc; export CC |
- CXX=g++; export CXX |
+ CC=gcc; export CC |
+ CXX=g++; export CXX |
;; |
MinGW) |
THE_OS="MinGW" |
@@ -315,11 +316,20 @@ case $platform in |
CXXFLAGS="--std=c++03" |
export CXXFLAGS |
;; |
+ MSYS/MSVC) |
+ THE_OS="MSYS" |
+ THE_COMP="Microsoft Visual C++" |
+ CC=cl; export CC |
+ CXX=cl; export CXX |
+ RELEASE_CFLAGS='-Gy -MD' |
+ RELEASE_CXXFLAGS='-Gy -MD' |
+ DEBUG_CFLAGS='-Zi -MDd' |
+ DEBUG_CXXFLAGS='-Zi -MDd' |
+ DEBUG_LDFLAGS='-DEBUG' |
+ ;; |
*BSD) |
THE_OS="BSD" |
THE_COMP="the GNU C++" |
- CC=gcc; export CC |
- CXX=g++; export CXX |
DEBUG_CFLAGS='-g -O0' |
DEBUG_CXXFLAGS='-g -O0' |
;; |
@@ -376,7 +386,7 @@ then |
fi |
if test "$RELEASE_CFLAGS" != "" |
then |
- CFLAGS="$CFLAGS $RELEASE_CFLAGS" |
+ CFLAGS="$RELEASE_CFLAGS $CFLAGS" |
fi |
if test "$RELEASE_CXXFLAGS" = "" |
then |
@@ -388,11 +398,11 @@ then |
fi |
if test "$RELEASE_CXXFLAGS" != "" |
then |
- CXXFLAGS="$CXXFLAGS $RELEASE_CXXFLAGS" |
+ CXXFLAGS="$RELEASE_CXXFLAGS $CXXFLAGS" |
fi |
if test "$RELEASE_LDFLAGS" != "" |
then |
- LDFLAGS="$LDFLAGS $RELEASE_LDFLAGS" |
+ LDFLAGS="$RELEASE_LDFLAGS $LDFLAGS" |
fi |
fi |
@@ -400,15 +410,15 @@ if test $debug -eq 1 |
then |
if test "$DEBUG_CFLAGS" != "" |
then |
- CFLAGS="$CFLAGS $DEBUG_CFLAGS" |
+ CFLAGS="$DEBUG_CFLAGS $CFLAGS" |
fi |
if test "$DEBUG_CXXFLAGS" != "" |
then |
- CXXFLAGS="$CXXFLAGS $DEBUG_CXXFLAGS" |
+ CXXFLAGS="$DEBUG_CXXFLAGS $CXXFLAGS" |
fi |
if test "$DEBUG_LDFLAGS" != "" |
then |
- LDFLAGS="$LDFLAGS $DEBUG_LDFLAGS" |
+ LDFLAGS="$DEBUG_LDFLAGS $LDFLAGS" |
fi |
fi |