From c0149d86c5e0572ab0376b79a42307f8ed38934d Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 15 Dec 2003 22:06:18 +0000 Subject: use the @CPP@ value from configure if possible when determining cpp in pidl (This used to be commit c47e88dabfc62db7533d2d39c7f1010b4188d2ea) --- source4/build/pidl/idl.pm | 6 +++++- source4/build/pidl/idl.yp | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'source4/build/pidl') diff --git a/source4/build/pidl/idl.pm b/source4/build/pidl/idl.pm index 5e285bdc7c..d5c0ae0071 100644 --- a/source4/build/pidl/idl.pm +++ b/source4/build/pidl/idl.pm @@ -1974,7 +1974,11 @@ sub parse_idl($$) my $saved_delim = $/; undef $/; - my $data = `cpp $filename`; + my $cpp = $ENV{CPP}; + if (! defined $cpp) { + $cpp = "cpp" + } + my $data = `$cpp -xc $filename`; $/ = $saved_delim; $self->YYData->{INPUT} = $data; diff --git a/source4/build/pidl/idl.yp b/source4/build/pidl/idl.yp index 3e9943a009..bfc4698709 100644 --- a/source4/build/pidl/idl.yp +++ b/source4/build/pidl/idl.yp @@ -304,7 +304,11 @@ sub parse_idl($$) my $saved_delim = $/; undef $/; - my $data = `cc -E $filename`; + my $cpp = $ENV{CPP}; + if (! defined $cpp) { + $cpp = "cpp" + } + my $data = `$cpp -xc $filename`; $/ = $saved_delim; $self->YYData->{INPUT} = $data; -- cgit