ICU-10580 revert r35955

X-SVN-Rev: 35956

diff --git a/icu4c/source/acinclude.m4 b/icu4c/source/acinclude.m4
index 797a2963770f4cdbc3da7e6a307a984f7e1354ac..aeadc2c664af320dd304036dc4b6449a796d7b9b 100644 (file)
--- a/icu4c/source/acinclude.m4
+++ b/icu4c/source/acinclude.m4
@@ -262,7 +262,7 @@ AC_DEFUN([AC_CHECK_64BIT_LIBS],
                     if test "$CAN_BUILD_64" != yes; then
                         # Nope. back out changes.
                         CFLAGS="${CFLAGS_OLD}"
-                        CXXFLAGS="${CXXFLAGS_OLD}"
+                        CXXFLAGS="${CFLAGS_OLD}"
                         # 2. try xarch=v9 [deprecated]
                         ## TODO: cross compile: the following won't work.
                         SPARCV9=`isainfo -n 2>&1 | grep sparcv9`
@@ -457,6 +457,9 @@ AC_DEFUN([AC_CHECK_STRICT_COMPILE],
         if test "$GCC" = yes
         then
             case "${host}" in
+            *-*-solaris*)
+                # Don't use -std=c99 option on Solaris/GCC
+                ;;
             *)
                 # Do not use -ansi. It limits us to C90, and it breaks some platforms.
                 # We use -std=c99 to disable the gnu99 defaults and its associated warnings

diff --git a/icu4c/source/config/mh-solaris-gcc b/icu4c/source/config/mh-solaris-gcc
index eac6d2fb0052cc78b4630db965ac9c63dd898522..313e1ab6373b31ebd2715f5d0bda64cff5da4dec 100644 (file)
--- a/icu4c/source/config/mh-solaris-gcc
+++ b/icu4c/source/config/mh-solaris-gcc
@@ -9,8 +9,8 @@ SHAREDLIBCXXFLAGS = -fPIC
 SHAREDLIBCPPFLAGS = -DPIC
 
 ## Commands to generate dependency files
-GEN_DEPS.c=    $(CC) -E -MM $(DEFS) $(CPPFLAGS) $(CFLAGS)
-GEN_DEPS.cc=   $(CXX) -E -MM $(DEFS) $(CPPFLAGS) $(CXXFLAGS)
+GEN_DEPS.c=    $(CC) -E -MM $(DEFS) $(CPPFLAGS)
+GEN_DEPS.cc=   $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
 
 ## These are the library specific LDFLAGS
 LDFLAGSICUDT=-nodefaultlibs -nostdlib