summaryrefslogtreecommitdiff
path: root/source4/build/smb_build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-18 11:50:07 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-18 11:50:07 +0100
commite8cf95773df914e8d71dcc1ce713fe0cc723d946 (patch)
treea06df092123445cc85e0361a542aa611bdf28e3d /source4/build/smb_build
parent9d0d614c7af6299482ba30c7c0ad36eed5af7474 (diff)
downloadsamba-e8cf95773df914e8d71dcc1ce713fe0cc723d946.tar.gz
samba-e8cf95773df914e8d71dcc1ce713fe0cc723d946.tar.bz2
samba-e8cf95773df914e8d71dcc1ce713fe0cc723d946.zip
Switch back to using static libraries for subsystems for now, since partial linking is still giving some problems.
(This used to be commit 0d8ddae4964dc50e981e12b6a93235a50a0607ff)
Diffstat (limited to 'source4/build/smb_build')
-rw-r--r--source4/build/smb_build/main.pl3
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 4c09e32422..46a092d69f 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -20,7 +20,8 @@ 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 = ["MERGED_OBJ"];
+$subsys_output_type = ["STATIC_LIBRARY"];
my $library_output_type;
if ($config::config{USESHARED} eq "true") {