From 2e588454fe160b39bd8134a2fb9cbac4fba39e2a Mon Sep 17 00:00:00 2001 From: James Peach Date: Mon, 2 Apr 2007 17:23:23 +0000 Subject: r22035: Introduce HOSTLD which is needed to link the asn1 compiler when cross compiling. (This used to be commit 976343821b99b04725c9fddee42dbcd0261c2d51) --- source4/build/smb_build/makefile.pm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'source4/build/smb_build') diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 43391d8775..926d83f0f7 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -141,6 +141,9 @@ INSTALL_LINK_FLAGS=$extra_link_flags LD=$self->{config}->{LD} LDFLAGS=$self->{config}->{LDFLAGS} -L$libdir +HOSTLD=$self->{config}->{HOSTLD} +# It's possible that we ought to have HOSTLD_LDFLAGS as well + STLD=$self->{config}->{STLD} STLD_FLAGS=$self->{config}->{STLD_FLAGS} @@ -387,11 +390,23 @@ sub Binary($$) $self->output(<< "__EOD__" $installdir/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST) \@echo Linking \$\@ +__EOD__ + ); + + if ($ctx->{"USE_HOSTCC"} =~ m/yes/i) { + $self->output(<< "__EOD__" + \@\$(HOSTLD) \$(LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\ + \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) +__EOD__ + ); + } else { + $self->output(<< "__EOD__" \@\$(LD) \$(LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\ \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) __EOD__ -); + ); + } } sub Manpage($$) -- cgit