From 8a33415f115c8e2afd78021370b5203f78e1b2f8 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 20 Apr 2007 07:36:21 +0000 Subject: r22400: only add srcdir and builddir path if they differ metze (This used to be commit 581f33d9200d980e7e407f21e687a2bda2cec615) --- source4/build/smb_build/cflags.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source4/build/smb_build/cflags.pm') diff --git a/source4/build/smb_build/cflags.pm b/source4/build/smb_build/cflags.pm index 7ce3ba3555..e6cdff02cd 100755 --- a/source4/build/smb_build/cflags.pm +++ b/source4/build/smb_build/cflags.pm @@ -15,6 +15,9 @@ sub create_cflags($$$$) open(CFLAGS_TXT,">$file") || die ("Can't open `$file'\n"); + my $src_ne_build = 0; + $src_ne_build = 1 unless ($srcdir eq $builddir); + foreach my $key (values %{$CTX}) { next unless defined ($key->{OBJ_LIST}); @@ -26,7 +29,7 @@ sub create_cflags($$$$) my $cflags = ""; foreach my $flag (@{$key->{FINAL_CFLAGS}}) { my $dir; - if (($dir) = ($flag =~ /^-I([^\/].*)$/)) { + if ($src_ne_build and ($dir) = ($flag =~ /^-I([^\/].*)$/)) { $cflags .= " -I$builddir/$dir"; $cflags .= " -I$srcdir/$dir"; } else { -- cgit