diff options
Diffstat (limited to 'source4/build')
-rw-r--r-- | source4/build/m4/public.m4 | 2 | ||||
-rw-r--r-- | source4/build/smb_build/output.pm | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4 index 00699acc6e..6e8be7fa5e 100644 --- a/source4/build/m4/public.m4 +++ b/source4/build/m4/public.m4 @@ -80,8 +80,8 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG], SMB_EXT_LIB_ENABLE($1, YES) AC_MSG_RESULT(yes), AC_MSG_RESULT(no), - CFLAGS="$OLD_CFLAGS" AC_MSG_WARN([cannot run when cross-compiling])) + CFLAGS="$OLD_CFLAGS" SMB_EXT_LIB($1, diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index 5593558c0c..848286946b 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -169,6 +169,11 @@ sub create_output($$) } } + foreach $part (values %{$depend}) { + $part->{EXTRA_CFLAGS} .= " ".join(" ", @{$part->{CFLAGS}}) if defined($part->{CFLAGS}); + $part->{EXTRA_CFLAGS} .= " ".join(" ", @{$part->{CPPFLAGS}}) if defined($part->{CPPFLAGS}); + } + return $depend; } |