1*4882a593SmuzhiyunFix cross-compilation 2*4882a593Smuzhiyun 3*4882a593SmuzhiyunFetched httpd-2.4.x-cross_compile.diff from upstream bugtracker: 4*4882a593Smuzhiyunhttps://issues.apache.org/bugzilla/show_bug.cgi?id=51257#c6 5*4882a593Smuzhiyun 6*4882a593Smuzhiyunwhich is a bundle of upstream revisions: 7*4882a593Smuzhiyun http://svn.apache.org/viewvc?view=revision&revision=1327907 8*4882a593Smuzhiyun http://svn.apache.org/viewvc?view=revision&revision=1328390 9*4882a593Smuzhiyun http://svn.apache.org/viewvc?view=revision&revision=1328714 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunSigned-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunIndex: server/Makefile.in 14*4882a593Smuzhiyun=================================================================== 15*4882a593Smuzhiyun--- a/server/Makefile.in (revision 1328714) 16*4882a593Smuzhiyun+++ b/server/Makefile.in (working copy) 17*4882a593Smuzhiyun@@ -22,9 +22,14 @@ 18*4882a593Smuzhiyun include $(top_builddir)/build/rules.mk 19*4882a593Smuzhiyun include $(top_srcdir)/build/library.mk 20*4882a593Smuzhiyun 21*4882a593Smuzhiyun+ifdef CC_FOR_BUILD 22*4882a593Smuzhiyun+gen_test_char: gen_test_char.c 23*4882a593Smuzhiyun+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DCROSS_COMPILE -o $@ $< 24*4882a593Smuzhiyun+else 25*4882a593Smuzhiyun gen_test_char_OBJECTS = gen_test_char.lo 26*4882a593Smuzhiyun gen_test_char: $(gen_test_char_OBJECTS) 27*4882a593Smuzhiyun $(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS) 28*4882a593Smuzhiyun+endif 29*4882a593Smuzhiyun 30*4882a593Smuzhiyun test_char.h: gen_test_char 31*4882a593Smuzhiyun ./gen_test_char > test_char.h 32*4882a593SmuzhiyunIndex: configure.in 33*4882a593Smuzhiyun=================================================================== 34*4882a593Smuzhiyun--- a/configure.in (revision 1328714) 35*4882a593Smuzhiyun+++ b/configure.in (working copy) 36*4882a593Smuzhiyun@@ -193,6 +193,14 @@ 37*4882a593Smuzhiyun dnl Try to get c99 support for variadic macros 38*4882a593Smuzhiyun ifdef([AC_PROG_CC_C99], [AC_PROG_CC_C99]) 39*4882a593Smuzhiyun 40*4882a593Smuzhiyun+dnl In case of cross compilation we set CC_FOR_BUILD to cc unless 41*4882a593Smuzhiyun+dnl we got already CC_FOR_BUILD from environment. 42*4882a593Smuzhiyun+if test "x${build_alias}" != "x${host_alias}"; then 43*4882a593Smuzhiyun+ if test "x${CC_FOR_BUILD}" = "x"; then 44*4882a593Smuzhiyun+ CC_FOR_BUILD=cc 45*4882a593Smuzhiyun+ fi 46*4882a593Smuzhiyun+fi 47*4882a593Smuzhiyun+ 48*4882a593Smuzhiyun if test "x${cache_file}" = "x/dev/null"; then 49*4882a593Smuzhiyun # Likewise, ensure that CC and CPP are passed through to the pcre 50*4882a593Smuzhiyun # configure script iff caching is disabled (the autoconf 2.5x default). 51*4882a593SmuzhiyunIndex: acinclude.m4 52*4882a593Smuzhiyun=================================================================== 53*4882a593Smuzhiyun--- a/acinclude.m4 (revision 1328714) 54*4882a593Smuzhiyun+++ ab/cinclude.m4 (working copy) 55*4882a593Smuzhiyun@@ -53,6 +53,8 @@ 56*4882a593Smuzhiyun APACHE_SUBST(CPPFLAGS) 57*4882a593Smuzhiyun APACHE_SUBST(CFLAGS) 58*4882a593Smuzhiyun APACHE_SUBST(CXXFLAGS) 59*4882a593Smuzhiyun+ APACHE_SUBST(CC_FOR_BUILD) 60*4882a593Smuzhiyun+ APACHE_SUBST(CFLAGS_FOR_BUILD) 61*4882a593Smuzhiyun APACHE_SUBST(LTFLAGS) 62*4882a593Smuzhiyun APACHE_SUBST(LDFLAGS) 63*4882a593Smuzhiyun APACHE_SUBST(LT_LDFLAGS) 64