sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-29 21:47:30 +03:00
Code

Use standard variable for partial linking.

Browse Source 
(This used to be commit 949fca9540889bb640466fc21ca36d08f77066a3)
This commit is contained in:
Jelmer Vernooij 2008-02-16 20:48:08 +01:00
parent 8d7e2eb68c
commit f6dec9de47
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source4/build/smb_build/input.pm
View File

@ -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);

2
source4/build/smb_build/makefile.pm
View File

@ -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__
);

3
source4/rules.mk
View File

@ -37,6 +37,9 @@ PCHCOMPILE = @$(CC) -Ilib/replace \
$(CFLAGS) `$(PERL) $(srcdir)/script/cflags.pl $@` \
$(PICFLAG) $(CPPFLAGS) -c $(FIRST_PREREQ) -o $@
# Partial linking
PARTLINK = @$(PROG_LD) -r
include/config.h:
@echo "include/config.h not present"
@echo "You need to rerun ./autogen.sh and ./configure"