svn commit: samba r25994 - in
branches/SAMBA_4_0/source/build/smb_build: .
metze at samba.org
metze at samba.org
Fri Nov 16 10:41:36 GMT 2007
Author: metze
Date: 2007-11-16 10:41:35 +0000 (Fri, 16 Nov 2007)
New Revision: 25994
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25994
Log:
build: use HOSTCC, HOSTCC_FLAGS, HOSTLD and HOSTLD_FLAGS
metze
Modified:
branches/SAMBA_4_0/source/build/smb_build/makefile.pm
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2007-11-16 10:39:52 UTC (rev 25993)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2007-11-16 10:41:35 UTC (rev 25994)
@@ -123,7 +123,7 @@
# Dependencies for host objects
HDEPENDS = \$(CC) -M -MG -MP -MT \$(<:.c=.ho) -MT \$@ \\
`\$(PERL) \$(srcdir)/script/cflags.pl \$@` \\
- \$(HOSTCC_CFLAGS) \$(FIRST_PREREQ) -o \$@
+ \$(HOSTCC_FLAGS) \$(FIRST_PREREQ) -o \$@
# Dependencies for precompiled headers
PCHDEPENDS = \$(CC) -M -MG -MT include/includes.h.gch -MT \$@ \\
\$(CFLAGS) \$(FIRST_PREREQ) -o \$@
@@ -146,7 +146,7 @@
# Run the compiler for the build host
HCOMPILE = \$(HOSTCC) `\$(PERL) \$(srcdir)/script/cflags.pl \$@` \\
- \$(HOSTCC_CFLAGS) -c \$(FIRST_PREREQ) -o \$@
+ \$(HOSTCC_FLAGS) -c \$(FIRST_PREREQ) -o \$@
# Precompile headers
PCHCOMPILE = @\$(CC) -Ilib/replace \\
@@ -188,17 +188,11 @@
CFLAGS=$self->{config}->{CFLAGS} \$(CPPFLAGS)
PICFLAG=$self->{config}->{PICFLAG}
-HOSTCC=$self->{config}->{HOSTCC}
-HOSTCC_CFLAGS=-D_SAMBA_HOSTCC_ $self->{config}->{CFLAGS} \$(CPPFLAGS)
-
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}
@@ -210,6 +204,12 @@
SHLIBEXT=$self->{config}->{SHLIBEXT}
+HOSTCC=$self->{config}->{HOSTCC}
+HOSTCC_FLAGS=-D_SAMBA_HOSTCC_ $self->{config}->{CFLAGS} \$(CPPFLAGS)
+
+HOSTLD=$self->{config}->{HOSTLD}
+HOSTLD_FLAGS=$self->{config}->{LDFLAGS}
+
XSLTPROC=$self->{config}->{XSLTPROC}
LEX=$self->{config}->{LEX}
@@ -505,7 +505,7 @@
if (defined($ctx->{USE_HOSTCC}) && $ctx->{USE_HOSTCC} eq "YES") {
$self->output(<< "__EOD__"
- \@\$(HOSTLD) \$(LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
+ \@\$(HOSTLD) \$(HOSTLD_FLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
\$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS)
__EOD__
);
More information about the samba-cvs
mailing list