diff options
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/smb_build/config_mk.pm | 2 | ||||
| -rw-r--r-- | source4/build/smb_build/main.pl | 2 | ||||
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 8 |
3 files changed, 2 insertions, 10 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index 7b23e83934..81c3363cfb 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -253,7 +253,7 @@ sub run_config_mk($$$$) next; } - die("$parsing_file:$linenum: Bad line while parsing $parsing_file"); + die("$parsing_file:$linenum: Bad line"); } $makefile .= "# }END $parsing_file\n"; 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") { diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index c56fdbf8cc..495c8fb967 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -176,14 +176,6 @@ sub MergedObj($$) $self->output("\$(call partial_link_template, $ctx->{OUTPUT}, \$($ctx->{NAME}_OBJ_FILES))\n"); } -sub StaticLibraryPrimitives($$) -{ - my ($self,$ctx) = @_; - - $self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n"); - $self->_prepare_list($ctx, "FULL_OBJ_LIST"); -} - sub InitFunctions($$) { my ($self, $ctx) = @_; |