| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Makefile.in: fix cross compiling failed |
| 2 | |
| 3 | The tools/gen_test_char was invoked at build time, |
| 4 | and it didn't work for the cross compiling, so we |
| 5 | compile it with $BUILD_CC. |
| 6 | |
| 7 | Remove the 'tools' dir creation, it always existed. |
| 8 | And it caused gen_test_char unexpected rebuilt at |
| 9 | do_install time. |
| 10 | |
| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 11 | Upstream-Status: Inappropriate [oe specific] |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 12 | |
| 13 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 14 | --- |
| 15 | Makefile.in | 10 ++-------- |
| 16 | 1 file changed, 2 insertions(+), 8 deletions(-) |
| 17 | |
| 18 | diff --git a/Makefile.in b/Makefile.in |
| 19 | index a2a5194..5fe028f 100644 |
| 20 | --- a/Makefile.in |
| 21 | +++ b/Makefile.in |
| 22 | @@ -46,7 +46,6 @@ LT_VERSION = @LT_VERSION@ |
| 23 | |
| 24 | CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \ |
| 25 | build/apr_rules.out tools/gen_test_char@EXEEXT@ \ |
| 26 | - tools/gen_test_char.o tools/gen_test_char.lo \ |
| 27 | include/private/apr_escape_test_char.h |
| 28 | DISTCLEAN_TARGETS = config.cache config.log config.status \ |
| 29 | include/apr.h include/arch/unix/apr_private.h \ |
| 30 | @@ -129,13 +128,8 @@ check: $(TARGET_LIB) |
| 31 | etags: |
| 32 | etags `find . -name '*.[ch]'` |
| 33 | |
| 34 | -OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS) |
| 35 | -tools/gen_test_char.lo: tools/gen_test_char.c |
| 36 | - $(APR_MKDIR) tools |
| 37 | - $(LT_COMPILE) |
| 38 | - |
| 39 | -tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char) |
| 40 | - $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) |
| 41 | +tools/gen_test_char@EXEEXT@: tools/gen_test_char.c |
| 42 | + $(BUILD_CC) $(CFLAGS_FOR_BUILD) $< -o $@ |
| 43 | |
| 44 | include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ |
| 45 | $(APR_MKDIR) include/private |