* sunrpc/Makefile (rpcgen-cmd): Use ../scripts/cpp in rpcgen calls.
	* scripts/cpp: New file.
This commit is contained in:
Ulrich Drepper 2001-11-02 02:08:57 +00:00
parent 2f653c01fc
commit 980c4d0449
3 changed files with 25 additions and 2 deletions

View File

@ -1,5 +1,8 @@
2001-11-01 Ulrich Drepper <drepper@redhat.com> 2001-11-01 Ulrich Drepper <drepper@redhat.com>
* sunrpc/Makefile (rpcgen-cmd): Use ../scripts/cpp in rpcgen calls.
* scripts/cpp: New file.
* elf/dl-load.c (_dl_map_object): Correct test of DF_1_NODEFLIB * elf/dl-load.c (_dl_map_object): Correct test of DF_1_NODEFLIB
for rtld_search_dirs content. Minor optimizations. for rtld_search_dirs content. Minor optimizations.

21
scripts/cpp Executable file
View File

@ -0,0 +1,21 @@
#! /bin/sh
cpp=`which cpp 2>/dev/null`
if test $? -ne 0; then
cpp=`type cpp 2>/dev/null | awk '{ print $NF }'`
if test $? -ne 0; then
cpp=`gcc -print-file-name=cpp 2>/dev/null`
if test $? -ne 0; then
if test -x /lib/cpp; then
cpp=/lib/cpp
else
echo "cpp not found" 1>&2
exit 1
fi
fi
fi
fi
exec $cpp $*
Local Variables:
mode: sh
End:

View File

@ -126,8 +126,7 @@ $(objpfx)rpcgen: $(addprefix $(objpfx),$(rpcgen-objs)) \
$(+link) $(+link)
# Tell rpcgen where to find the C preprocessor. # Tell rpcgen where to find the C preprocessor.
rpcgen-cmd = $(built-program-cmd) -Y `$(CC) -print-file-name=cpp | \ rpcgen-cmd = $(built-program-cmd) -Y ../scripts
sed 's|/cpp$$||'`
# Install the rpc data base file. # Install the rpc data base file.
$(inst_sysconfdir)/rpc: etc.rpc $(+force) $(inst_sysconfdir)/rpc: etc.rpc $(+force)