diff options
| -rw-r--r-- | source4/build/smb_build/output.pm | 8 |
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 { |