diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-10 20:59:17 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-10 20:59:17 +0200 |
commit | 6267dd78539863a5ec75b6cadba39184a2efc9b5 (patch) | |
tree | 9843465f180c8b0c3ade9701dd9cf7e1afd96eae /source4/build/smb_build/main.pl | |
parent | 640792fb5841ef03e83e59d8d74d65b6f7203756 (diff) | |
download | samba-6267dd78539863a5ec75b6cadba39184a2efc9b5.tar.gz samba-6267dd78539863a5ec75b6cadba39184a2efc9b5.tar.bz2 samba-6267dd78539863a5ec75b6cadba39184a2efc9b5.zip |
Clean up some git merges gone wrong.
(This used to be commit 42eb6b33462228467e65a51bbf624c481802b090)
Diffstat (limited to 'source4/build/smb_build/main.pl')
-rw-r--r-- | source4/build/smb_build/main.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index ccaac0b6fc..d31bea73f3 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -51,7 +51,7 @@ foreach my $key (values %$OUTPUT) { $mkenv->StaticLibraryPrimitives($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}}); $mkenv->MergedObj($key) if grep(/MERGED_OBJ/, @{$key->{OUTPUT_TYPE}}); - $kenv->SharedLibraryPrimitives($key) if ($key->{TYPE} eq "LIBRARY") and + $mkenv->SharedLibraryPrimitives($key) if ($key->{TYPE} eq "LIBRARY") and grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}}); if ($key->{TYPE} eq "LIBRARY" and ${$key->{OUTPUT_TYPE}}[0] eq "SHARED_LIBRARY") { |