summaryrefslogtreecommitdiff
path: root/source4/build/smb_build
diff options
context:
space:
mode:
Diffstat (limited to 'source4/build/smb_build')
-rw-r--r--source4/build/smb_build/TODO1
-rw-r--r--source4/build/smb_build/makefile.pm2
-rw-r--r--source4/build/smb_build/output.pm6
3 files changed, 7 insertions, 2 deletions
diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
index cc15e9099a..148abd6eda 100644
--- a/source4/build/smb_build/TODO
+++ b/source4/build/smb_build/TODO
@@ -1,4 +1,3 @@
-- replace StrnCpy() with strlcpy()
- Add --export-dynamic for each subsystem that has modules
- let the build system implement some make functions($(patsubst),$(wildcard),...) and use our own implementations where `make' does not support them
- include extra_flags.txt using Makefile construction if
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index e6865d5e60..8313044bc9 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -323,6 +323,8 @@ sub StaticLibrary($$)
{
my ($self,$ctx) = @_;
+ return unless (defined($ctx->{OBJ_FILES}));
+
push (@{$self->{static_libs}}, $ctx->{TARGET});
$self->output("$ctx->{TYPE}_$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
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($)