DEVEL15-more-cpp-fixes-20080701

LICENSE BSD

Use PATH_CPP instead of CPP everywhere and always redirect the output
instead of assuming that it will write to a file.  Hopefully this is the
least common denominator across all systems, although it still isn't
fully correct for systems that have no separate cpp binary.

(cherry picked from commit c733e2e07aeb0cc981d53d843a1ffb787f43ed64)

diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in
index bdc5b9781bebff7348d361daf13399699c996603..852a4a00147380d33baef8c61ad17e8c7e43a1cc 100644 (file)
--- a/src/libafsrpc/Makefile.in
+++ b/src/libafsrpc/Makefile.in
@@ -358,7 +358,7 @@ lock.o: ${LWP}/lock.c
 syscall.o: ${SYS}/syscall.s
        case "$(SYS_NAME)" in \
             sun4x_5* | sunx86_5*) \
-               $(CPP)  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
+               $(PATH_CPP)  ${SFLAGS} ${SYS}/syscall.s > syscall.ss; \
                as -o syscall.o syscall.ss;             \
                $(RM) syscall.ss;;                              \
         sgi_* | *_darwin_* ) \

diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in
index 87db1392f9547f4e663dcc1631e0baf7cc9e6773..2fd7d63ee80d41977d3370781e9adc4270f8fc1d 100644 (file)
--- a/src/lwp/Makefile.in
+++ b/src/lwp/Makefile.in
@@ -37,7 +37,7 @@ process.o     : process.s process.i386.s process.c
        pmax_he1) \
                $(CCOBJ) ${LWP_DBG} ${LWP_OPTMZ} -c -I${TOP_INCDIR} process.s;; \
        sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53  | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5* | arm_linux* ) \
-               $(CPP) -P -I${TOP_INCDIR} ${srcdir}/process.s process.ss; \
+               $(PATH_CPP) -P -I${TOP_INCDIR} ${srcdir}/process.s > process.ss; \
                ${AS} process.ss -o process.o; \
                        $(RM) process.ss ;; \
        sgi_5* ) \
@@ -45,11 +45,11 @@ process.o   : process.s process.i386.s process.c
        sgi_61 | sgi_62 | sgi_63 ) \
                $(CCOBJ) ${LWP_DBG} ${LWP_OPTMZ} -c ${XCFLAGS} ${ARCHFLAGS} -I${TOP_INCDIR} -KPIC -G0  ${srcdir}/process.s;; \
        s390_*) \
-               $(CPP) -P -I${TOP_INCDIR} ${srcdir}/process.s390.s >process.ss; \
+               $(PATH_CPP) -P -I${TOP_INCDIR} ${srcdir}/process.s390.s >process.ss; \
                ${AS} -ahlns process.ss -o process.o >process.lst; \
                $(RM) process.ss ;; \
        s390x_*) \
-               $(CPP) -P -I${TOP_INCDIR} ${srcdir}/process.s390x.s >process.ss; \
+               $(PATH_CPP) -P -I${TOP_INCDIR} ${srcdir}/process.s390x.s >process.ss; \
                ${AS} -ahlns process.ss -o process.o >process.lst; \
                $(RM) process.ss ;; \
        *_darwin* ) \
@@ -88,11 +88,11 @@ process.o   : process.s process.i386.s process.c
                ${AS} process.ss -o process.o ;  \
                $(RM) -f process.S ;;\
        ncrx86_* | sunx86_*) \
-               $(CPP) -P -D__sun -D__i386 -DIGNORE_STDS_H -I${TOP_INCDIR} -I${srcdir} ${srcdir}/process.i386.s process.ss; \
+               $(PATH_CPP) -P -D__sun -D__i386 -DIGNORE_STDS_H -I${TOP_INCDIR} -I${srcdir} ${srcdir}/process.i386.s > process.ss; \
                ${AS} -o process.o process.ss; \
                $(RM) process.ss ;; \
        alpha_nbsd* ) \
-               $(CPP) -DASSEMBLER -P -I${TOP_INCDIR} ${srcdir}/process.s > process.ss; \
+               $(PATH_CPP) -DASSEMBLER -P -I${TOP_INCDIR} ${srcdir}/process.s > process.ss; \
                ${AS} -o process.o process.ss; \
                $(RM) process.ss ;; \
        hp* | *_linux* | *_umlinux* | sgi_64 | sgi_65 ) \
@@ -103,11 +103,11 @@ process.o : process.s process.i386.s process.c
        ia64_hpux11* | hp_ux11* ) \
                ${CC} ${CFLAGS} -c ${srcdir}/process.c;; \
        i386_*) \
-               $(CPP) -P -I${TOP_INCDIR} -I${srcdir} ${srcdir}/process.i386.s process.ss; \
+               $(PATH_CPP) -P -I${TOP_INCDIR} -I${srcdir} ${srcdir}/process.i386.s > process.ss; \
                ${AS} process.ss -o process.o; \
                $(RM) process.ss ;; \
        *) \
-               $(CPP) -P -I${TOP_INCDIR} ${srcdir}/process.s process.ss; \
+               $(PATH_CPP) -P -I${TOP_INCDIR} ${srcdir}/process.s > process.ss; \
                ${AS} process.ss -o process.o; \
                $(RM) process.ss ;; \
        esac

diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in
index 1196eaff7c88fb75a92bb59d06ece8e87f164a26..fc6871c97efa7184123ba1896a4db8a109092c21 100644 (file)
--- a/src/shlibafsrpc/Makefile.in
+++ b/src/shlibafsrpc/Makefile.in
@@ -366,7 +366,7 @@ fasttime.o: ${LWP}/fasttime.c
 syscall.o: ${SYS}/syscall.s
        case "$(SYS_NAME)" in \
             sun4x_5* | sunx86_5*) \
-               $(CPP)  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
+               $(PATH_CPP)  ${SFLAGS} ${SYS}/syscall.s > syscall.ss; \
                as -o syscall.o syscall.ss;             \
                $(RM) syscall.ss;;                              \
         sgi_* | *_darwin_* ) \