diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-29 11:32:54 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:12 -0500 |
| commit | a3b8cfbc8f5b18a342dee79fd9928cbcc2fbb025 (patch) | |
| tree | d9698ad3cdc88b9b841afad5e4d87848a454deb8 /source4/build/smb_build/output.pm | |
| parent | 26259ce98b20e6ae797afdfe9d3b8cf43cf01702 (diff) | |
| download | samba-a3b8cfbc8f5b18a342dee79fd9928cbcc2fbb025.tar.gz samba-a3b8cfbc8f5b18a342dee79fd9928cbcc2fbb025.tar.bz2 samba-a3b8cfbc8f5b18a342dee79fd9928cbcc2fbb025.zip | |
r15318: Don't create empty static libraries as some hosts have trouble with them.
(This used to be commit 1505d7c6001f8a35e728a14af2885b813c32ebe7)
Diffstat (limited to 'source4/build/smb_build/output.pm')
| -rw-r--r-- | source4/build/smb_build/output.pm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index 85c78cf3b4..e6cbcc0036 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -86,7 +86,11 @@ sub generate_static_library($) push(@{$lib->{LINK_FLAGS}}, "\$($lib->{TYPE}_$lib->{NAME}\_OBJ_LIST)"); $lib->{TARGET} = "bin/$lib->{LIBRARY_NAME}"; - $lib->{OUTPUT} = "-l".lc($link_name); + if (defined($lib->{OBJ_FILES})) { + $lib->{OUTPUT} = $lib->{TARGET}; + } else { + $lib->{OUTPUT} = ""; + } } sub generate_binary($) |