r19618: pass -D_SAMBA_HOSTCC_ when using the hostcompiler

metze

diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index 0158597f7478497067a11ca5ffce95f23ba0d1a3..f763ccbc187eb8bc96a6391a2aeda1645ce3ba7f 100644 (file)
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -130,7 +130,9 @@ CPPFLAGS=$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\
 CC=$self->{config}->{CC}
 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=-Wl,-rpath-link,\$(builddir)/bin/shared
 

diff --git a/source/main.mk b/source/main.mk
index da165c963e594845a9abc7aae9a20a62f030e32e..235465ea509a20a9a93ed9a55d3b4204cc53a13f 100644 (file)
--- a/source/main.mk
+++ b/source/main.mk
@@ -341,7 +341,7 @@ unused_macros:
 
 .c.hd:
        @echo "Generating host-compiler dependencies for $<"
-       @$(CC) -M -MG -MP -MT $(<:.c=.ho) -MT $@ `$(PERL) $(srcdir)/script/cflags.pl $@` $(CFLAGS) $< -o $@
+       @$(CC) -M -MG -MP -MT $(<:.c=.ho) -MT $@ `$(PERL) $(srcdir)/script/cflags.pl $@` $(HOSTCC_CFLAGS) $< -o $@
 
 include/includes.d: include/includes.h
        @echo "Generating dependencies for $<"
@@ -366,10 +366,10 @@ include/includes.d: include/includes.h
 
 .c.ho:
        @echo "Compiling $*.c with host compiler"
-       @$(HOSTCC) `$(PERL) $(srcdir)/script/cflags.pl $@` $(CFLAGS) -c $*.c -o $@ && exit 0;\
+       @$(HOSTCC) `$(PERL) $(srcdir)/script/cflags.pl $@` $(HOSTCC_CFLAGS) -c $*.c -o $@ && exit 0;\
                echo "The following command failed:" 1>&2;\
-               echo "$(HOSTCC) `$(PERL) $(srcdir)/script/cflags.pl $@` $(CFLAGS) -c $*.c -o $@" 1>&2;\
-               $(HOSTCC) `$(PERL) $(srcdir)/script/cflags.pl $@` $(CFLAGS) -c $*.c -o $@ >/dev/null 2>&1
+               echo "$(HOSTCC) `$(PERL) $(srcdir)/script/cflags.pl $@` $(HOSTCC_CFLAGS) -c $*.c -o $@" 1>&2;\
+               $(HOSTCC) `$(PERL) $(srcdir)/script/cflags.pl $@` $(HOSTCC_CFLAGS) -c $*.c -o $@ >/dev/null 2>&1
 
 .h.h.gch:
        @echo "Precompiling $<"