mirror of
https://github.com/samba-team/samba.git
synced 2025-01-17 02:05:21 +03:00
use the @CPP@ value from configure if possible when determining cpp in
pidl
This commit is contained in:
parent
66e648f20f
commit
c47e88dabf
@ -643,10 +643,10 @@ pch: basics
|
||||
|
||||
|
||||
idl_full: build/pidl/idl.pm
|
||||
script/build_idl.sh FULL
|
||||
CPP="@CPP@" script/build_idl.sh FULL
|
||||
|
||||
idl: build/pidl/idl.pm
|
||||
@script/build_idl.sh
|
||||
@CPP="@CPP@" script/build_idl.sh
|
||||
|
||||
basics: idl proto_test
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user