[PATCH:imake] Let configure pick cpp path on Solaris, instead of hardcoding in imakemdep.h

Alan Coopersmith alan.coopersmith at oracle.com
Thu Dec 27 17:05:23 PST 2012


Simply removing the definition lets the path found by configure be used,
seems to be the simplest way to handle the move from /usr/ccs/lib/cpp on
Solaris 10 and older to /usr/lib/cpp on Solaris 11 & later.

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
 imakemdep.h |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/imakemdep.h b/imakemdep.h
index 458849a..61dc4e0 100644
--- a/imakemdep.h
+++ b/imakemdep.h
@@ -294,9 +294,6 @@ in this Software without prior written authorization from The Open Group.
 #   if defined(_IBMR2) && !defined(DEFAULT_CPP)
 #    define DEFAULT_CPP "/usr/ccs/lib/cpp"
 #   endif
-#   if defined(sun) && (defined(SVR4) || defined(__svr4__) || defined(__SVR4) || defined(__sol__))
-#    define DEFAULT_CPP "/usr/ccs/lib/cpp"
-#   endif
 #   ifdef __bsdi__
 #    define DEFAULT_CPP "/usr/bin/cpp"
 #   endif
-- 
1.7.9.2



More information about the xorg-devel mailing list