summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-01-18 03:27:12 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:08:58 -0500
commit190b90e37d6ebf7228bdd5649e2b266f8867ac72 (patch)
tree5e5f834ca596c9a154dc2555597604a9a7ab0dd3
parentb3416c6de44553f408cede77da720f8ebc85d0d6 (diff)
downloadsamba-190b90e37d6ebf7228bdd5649e2b266f8867ac72.tar.gz
samba-190b90e37d6ebf7228bdd5649e2b266f8867ac72.tar.bz2
samba-190b90e37d6ebf7228bdd5649e2b266f8867ac72.zip
r4813: this is a temporary solution to a link problem we have on some
platforms. The problem is that some loaders (for example the IRIX 6.5 machine us4 in the build farm) must have libs listed after object files that depend on them on the link line. If you put the libs first then all the symbols in the libs remain unresolved. I think the correct fix for this is to separate xxx_LINK_LIBS out from the current xxx_LINK_FLAGS, and use xxx_LINK_FLAGS followed by xxx_LINK_LIST followed by xxx_LINK_LIBS. I'm hoping metze or jelmer, as our build wizards, might take a look at this when they get time. This interim fix should work fine, but its rather ugly, as it lists the flags and libs twice in each link. (This used to be commit db7d43fbb95748c85316b41ad3dc4eb967ed8a08)
-rw-r--r--source4/build/smb_build/makefile.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 0855beed08..dae347f13f 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -487,7 +487,8 @@ bin/$ctx->{BINARY}: bin/.dummy \$(BINARY_$ctx->{NAME}_DEPEND_LIST)
\@echo Linking \$\@
\@\$(LD) \$(LD_FLAGS) -o \$\@ \\
\$(BINARY_$ctx->{NAME}_LINK_FLAGS) \\
- \$(BINARY_$ctx->{NAME}_LINK_LIST)
+ \$(BINARY_$ctx->{NAME}_LINK_LIST) \\
+ \$(BINARY_$ctx->{NAME}_LINK_FLAGS)
binary_$ctx->{BINARY}: basics bin/$ctx->{BINARY}
# End Binary $ctx->{BINARY}
###################################