summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-26 03:28:44 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-26 03:28:44 +0100
commit227df641f680d844c85ea0ed1694e41ed355e262 (patch)
treed549c133b9e8970520f58f3510204c1b3f8d4382
parent42176ab7ef4282922d1b8375b7cc8f207b247faa (diff)
downloadsamba-227df641f680d844c85ea0ed1694e41ed355e262.tar.gz
samba-227df641f680d844c85ea0ed1694e41ed355e262.tar.bz2
samba-227df641f680d844c85ea0ed1694e41ed355e262.zip
Revert cflags hack.
(This used to be commit c01c841cf953550b21a6a84b0cb036bdfd436e13)
-rw-r--r--source4/build/smb_build/output.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index 67794f9d54..eec438b108 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -164,8 +164,8 @@ sub create_output($$)
my $elem = $depend->{$_};
next if $elem == $part;
- push(@{$part->{FINAL_CFLAGS}}, "\$($elem->{NAME}_CPPFLAGS)");
- push(@{$part->{FINAL_CFLAGS}}, "\$($elem->{NAME}_CFLAGS)");
+ merge_array(\$part->{FINAL_CFLAGS}, $elem->{CPPFLAGS});
+ merge_array(\$part->{FINAL_CFLAGS}, $elem->{CFLAGS});
}
# Always import the link options of the unique dependencies
@@ -173,8 +173,8 @@ sub create_output($$)
my $elem = $depend->{$_};
next if $elem == $part;
- push(@{$part->{LINK_FLAGS}}, "\$($elem->{NAME}_LIBS)");
- push(@{$part->{LINK_FLAGS}}, "\$($elem->{NAME}_LDFLAGS");
+ push(@{$part->{LINK_FLAGS}}, @{$elem->{LIBS}}) if defined($elem->{LIBS});
+ push(@{$part->{LINK_FLAGS}}, @{$elem->{LDFLAGS}}) if defined($elem->{LDFLAGS});
if (defined($elem->{OUTPUT_TYPE}) and @{$elem->{OUTPUT_TYPE}}[0] eq "MERGED_OBJ") {
push (@{$part->{FULL_OBJ_LIST}}, $elem->{TARGET});
} else {