diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 16:02:33 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 16:02:33 +0100 |
| commit | 80cbff3d011ad9264462812f57991ed0393b385e (patch) | |
| tree | 4b6542dbc0fa9f4fcd6a2101f38446b8eaa361b9 /source4/build/smb_build | |
| parent | 51b0a285f02e1bc6187e64514f3f59f546bbecc5 (diff) | |
| download | samba-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')
| -rw-r--r-- | source4/build/smb_build/main.pl | 3 | ||||
| -rw-r--r-- | source4/build/smb_build/output.pm | 12 |
2 files changed, 10 insertions, 5 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") { diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index 586ea121cb..67b905ef55 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -97,9 +97,14 @@ sub generate_merged_obj($) my $link_name = $lib->{NAME}; $link_name =~ s/^LIB//; - $lib->{MERGED_OBJNAME} = lc($link_name).".o"; - $lib->{RESULT_MERGED_OBJ} = $lib->{OUTPUT_MERGED_OBJ} = "bin/mergedobj/$lib->{MERGED_OBJNAME}"; - $lib->{TARGET_MERGED_OBJ} = $lib->{RESULT_MERGED_OBJ}; + if (defined($lib->{OBJ_FILES})) { + $lib->{MERGED_OBJNAME} = lc($link_name).".o"; + $lib->{RESULT_MERGED_OBJ} = $lib->{OUTPUT_MERGED_OBJ} = "bin/mergedobj/$lib->{MERGED_OBJNAME}"; + $lib->{TARGET_MERGED_OBJ} = $lib->{RESULT_MERGED_OBJ}; + } else { + $lib->{TARGET_MERGED_OBJ} = ""; + $lib->{RESULT_MERGED_OBJ} = ""; + } } sub generate_static_library($) @@ -121,6 +126,7 @@ sub generate_static_library($) $lib->{OUTPUT_STATIC_LIBRARY} = "-l".lc($link_name); } else { $lib->{RESULT_STATIC_LIBRARY} = ""; + $lib->{TARGET_STATIC_LIBRARY} = ""; $lib->{OUTPUT_STATIC_LIBRARY} = ""; } } |