From 21aa8c49c7fb2014a7fa4aaea65eba0bb067417b Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 7 Sep 2006 14:00:40 +0000
Subject: r18222: filter out double entries from CFLAGS

metze
(This used to be commit 42e70d5a7b9c12527bb49f9c60330706d350cf49)
---
 source4/build/smb_build/cflags.pm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(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 6dfe4fe94e..71898a582b 100755
--- a/source4/build/smb_build/cflags.pm
+++ b/source4/build/smb_build/cflags.pm
@@ -14,15 +14,18 @@ sub create_cflags($$)
 
 	foreach my $key (values %{$CTX}) {
 		next unless defined ($key->{OBJ_LIST});
-		next unless defined ($key->{CFLAGS});
-		next if ($key->{CFLAGS} eq "");
+
+		next unless defined ($key->{FINAL_CFLAGS});
+		next unless ($#{$key->{FINAL_CFLAGS}} >= 0);
+
+		my $cflags = join(' ', @{$key->{FINAL_CFLAGS}});
 
 		foreach (@{$key->{OBJ_LIST}}) {
 			my $ofile = $_;
 			my $dfile = $_;
 			$dfile =~ s/\.o$/.d/;
 			$dfile =~ s/\.ho$/.d/;
-			print CFLAGS_TXT "$ofile $dfile: CFLAGS+=$key->{CFLAGS}\n";
+			print CFLAGS_TXT "$ofile $dfile: CFLAGS+= $cflags\n";
 		}
 	}
 	close(CFLAGS_TXT);
-- 
cgit