summaryrefslogtreecommitdiff
path: root/source4/build/smb_build/main.pl
diff options
context:
space:
mode:
Diffstat (limited to 'source4/build/smb_build/main.pl')
-rw-r--r--source4/build/smb_build/main.pl8
1 files changed, 2 insertions, 6 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index bf11e8c896..747118db33 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -33,9 +33,7 @@ my $library_output_type;
if (defined($ENV{"LIBRARY_OUTPUT_TYPE"})) {
$library_output_type = $ENV{LIBRARY_OUTPUT_TYPE};
} elsif ($config::config{BLDSHARED} eq "true") {
- #FIXME: This should eventually become SHARED_LIBRARY
- # rather then MERGEDOBJ once I'm certain it works ok -- jelmer
- $library_output_type = "MERGEDOBJ";
+ $library_output_type = "SHARED_LIBRARY";
} elsif ($config::config{BLDMERGED} eq "true") {
$library_output_type = "MERGEDOBJ";
} else {
@@ -46,9 +44,7 @@ my $module_output_type;
if (defined($ENV{"MODULE_OUTPUT_TYPE"})) {
$module_output_type = $ENV{MODULE_OUTPUT_TYPE};
} elsif ($config::config{BLDSHARED} eq "true") {
- #FIXME: This should eventually become SHARED_LIBRARY
- # rather then MERGEDOBJ once I'm certain it works ok -- jelmer
- $module_output_type = "MERGEDOBJ";
+ $module_output_type = "SHARED_LIBRARY";
} elsif ($config::config{BLDMERGED} eq "true") {
$module_output_type = "MERGEDOBJ";
} else {