summaryrefslogtreecommitdiff
path: root/source4/build/smb_build/main.pl
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-18 16:02:33 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-18 16:02:33 +0100
commit80cbff3d011ad9264462812f57991ed0393b385e (patch)
tree4b6542dbc0fa9f4fcd6a2101f38446b8eaa361b9 /source4/build/smb_build/main.pl
parent51b0a285f02e1bc6187e64514f3f59f546bbecc5 (diff)
downloadsamba-80cbff3d011ad9264462812f57991ed0393b385e.tar.gz
samba-80cbff3d011ad9264462812f57991ed0393b385e.tar.bz2
samba-80cbff3d011ad9264462812f57991ed0393b385e.zip
Fix build with partial linking.
(This used to be commit bfad9610c472e8d7e3656e19c8dbb6b85727dc13)
Diffstat (limited to 'source4/build/smb_build/main.pl')
-rw-r--r--source4/build/smb_build/main.pl3
1 files changed, 1 insertions, 2 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 46a092d69f..4c09e32422 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -20,8 +20,7 @@ my $INPUT = {};
my $mkfile = smb_build::config_mk::run_config_mk($INPUT, $config::config{srcdir}, $config::config{builddir}, "main.mk");
my $subsys_output_type;
-#$subsys_output_type = ["MERGED_OBJ"];
-$subsys_output_type = ["STATIC_LIBRARY"];
+$subsys_output_type = ["MERGED_OBJ"];
my $library_output_type;
if ($config::config{USESHARED} eq "true") {