sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-11 16:58:40 +03:00
Code

r22035: Introduce HOSTLD which is needed to link the asn1 compiler when cross

Browse Source 
compiling.
This commit is contained in:
James Peach 2007-04-02 17:23:23 +00:00 committed by Gerald (Jerry) Carter
parent 8b19b8bfbe
commit 976343821b
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/build/m4/check_ld.m4
View File

@ -36,6 +36,17 @@ SHLIBEXT="so"
SONAMEFLAG="" SONAMEFLAG=""
PICFLAG="" PICFLAG=""
# allow for --with-hostld=gcc
AC_ARG_WITH(hostld,[ --with-hostld=linker choose host linker],
[HOSTLD=$withval],
[
if test z"$cross_compiling" = "yes"; then
HOSTLD='$(HOSTCC)'
else
HOSTLD='$(LD)'
fi
])
AC_MSG_CHECKING([ability to build shared libraries]) AC_MSG_CHECKING([ability to build shared libraries])
# and these are for particular systems # and these are for particular systems
@ -144,6 +155,8 @@ AC_MSG_RESULT([$LD])
AC_MSG_CHECKING([LDFLAGS]) AC_MSG_CHECKING([LDFLAGS])
AC_MSG_RESULT([$LDFLAGS]) AC_MSG_RESULT([$LDFLAGS])
AC_SUBST(HOSTLD)
AC_MSG_CHECKING([STLD]) AC_MSG_CHECKING([STLD])
AC_MSG_RESULT([$STLD]) AC_MSG_RESULT([$STLD])
AC_MSG_CHECKING([STLD_FLAGS]) AC_MSG_CHECKING([STLD_FLAGS])

17
source/build/smb_build/makefile.pm
View File

@ -141,6 +141,9 @@ INSTALL_LINK_FLAGS=$extra_link_flags
LD=$self->{config}->{LD} LD=$self->{config}->{LD}
LDFLAGS=$self->{config}->{LDFLAGS} -L$libdir 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=$self->{config}->{STLD}
STLD_FLAGS=$self->{config}->{STLD_FLAGS} STLD_FLAGS=$self->{config}->{STLD_FLAGS}
@ -387,11 +390,23 @@ sub Binary($$)
$self->output(<< "__EOD__" $self->output(<< "__EOD__"
$installdir/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST) $installdir/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)
\@echo Linking \$\@ \@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) \\ \@\$(LD) \$(LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
\$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS)
__EOD__ __EOD__
); );
}
} }
sub Manpage($$) sub Manpage($$)