summaryrefslogtreecommitdiff
path: root/source4/build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-16 20:48:08 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-16 20:48:08 +0100
commitf6dec9de4715892abab6cc9f75c2eb6c70f75947 (patch)
tree7f76df10b1dd398c0197b80f0b009199bf66ab3f /source4/build
parent8d7e2eb68c7c63ef36d24ce59953c20c2579aa5f (diff)
downloadsamba-f6dec9de4715892abab6cc9f75c2eb6c70f75947.tar.gz
samba-f6dec9de4715892abab6cc9f75c2eb6c70f75947.tar.bz2
samba-f6dec9de4715892abab6cc9f75c2eb6c70f75947.zip
Use standard variable for partial linking.
(This used to be commit 949fca9540889bb640466fc21ca36d08f77066a3)
Diffstat (limited to 'source4/build')
-rw-r--r--source4/build/smb_build/input.pm1
-rw-r--r--source4/build/smb_build/makefile.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index 51c89a834f..02eafe2033 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -234,6 +234,7 @@ sub calc_unique_deps($$$$$$$$)
if (defined ($dep->{OUTPUT_TYPE}) &&
($withlibs or
(@{$dep->{OUTPUT_TYPE}}[0] eq "INTEGRATED") or
+ (@{$dep->{OUTPUT_TYPE}}[0] eq "MERGED_OBJ") or
(@{$dep->{OUTPUT_TYPE}}[0] eq "STATIC_LIBRARY"))) {
push (@$busy, $dep->{NAME});
calc_unique_deps($dep->{NAME}, $INPUT, $dep->{PUBLIC_DEPENDENCIES}, $udeps, $withlibs, $forward, $pubonly, $busy);
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 6ea3b8d950..34092c69bd 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -289,7 +289,7 @@ sub MergedObj($$)
$ctx->{TARGET_MERGED_OBJ}: \$($ctx->{NAME}_FULL_OBJ_LIST)
\@echo Partially linking \$@
\@mkdir -p bin/mergedobj
- \@\$(LD) -r -o \$@ \$($ctx->{NAME}_FULL_OBJ_LIST)
+ \$(PARTLINK) -o \$@ \$($ctx->{NAME}_FULL_OBJ_LIST)
__EOD__
);