From c611432605bbeea62e44785b5a66f749c670bae1 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 28 May 2008 01:41:57 +0200 Subject: Depend on debug names of shared libs for linking. (This used to be commit 2e3296f181acd8010cb1465097b91ae8cbf38b5f) --- source4/build/smb_build/output.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/build') diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index f9f12c3a73..76c6d3fc8f 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -52,7 +52,7 @@ sub generate_shared_library($) $lib->{RESULT_SHARED_LIBRARY} = "$lib->{SHAREDDIR}/$lib->{LIBRARY_REALNAME}"; $lib->{OUTPUT_SHARED_LIBRARY} = "-l$link_name"; - $lib->{TARGET_SHARED_LIBRARY} = $lib->{RESULT_SHARED_LIBRARY}; + $lib->{TARGET_SHARED_LIBRARY} = "$lib->{SHAREDDIR}/$lib->{LIBRARY_DEBUGNAME}"; } sub generate_merged_obj($) -- cgit From 8fb5ac6227e2b6123bb9fabc99fba36bd9aa0a92 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 28 May 2008 04:11:40 +0200 Subject: Fix dependency on swig ldb module. (This used to be commit e616a9a1e55aa2265fd2fb4cd2dd0c3490158383) --- source4/build/smb_build/input.pm | 1 - 1 file changed, 1 deletion(-) (limited to 'source4/build') diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index a76da496d9..53a051a3c7 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/build/smb_build/input.pm @@ -84,7 +84,6 @@ sub check_module($$$) return if ($mod->{ENABLE} ne "YES"); - if (exists($INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTION_TYPE})) { $mod->{INIT_FUNCTION_TYPE} = $INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTION_TYPE}; } else { -- cgit