1 files changed, 6 insertions, 1 deletions

diff --git a/configure b/configure
index 6188e7342fe..0e79c5aa980 100755
--- a/configure
+++ b/configure
@@ -2996,7 +2996,12 @@ _ACEOF
                 ;;
       *-sunos5* | *-solaris* )
                 opsys=sol2-6
-                NON_GNU_CPP=/usr/ccs/lib/cpp
+                if [ "x$CC" = x/opt/SUNWspro/bin/cc ]; then
+                  ## -Xs prevents spurious whitespace.
+                  NON_GNU_CPP="/opt/SUNWspro/bin/cc -E -Xs"
+                else
+                  NON_GNU_CPP=/usr/ccs/lib/cpp
+                fi
                 ;;
       *                   ) opsys=bsd4-2   ;;
     esac