| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From 9b40619ff6fddfef2758ba797789f8487f412df3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Robert Yang <liezhi.yang@windriver.com> |
| 3 | Date: Mon, 16 Feb 2015 00:50:01 -0800 |
| 4 | Subject: [PATCH] confgen: don't build unix.o twice |
| 5 | |
| 6 | Fixed: |
| 7 | unix/os.o: file not recognized: File truncated |
| 8 | collect2: error: ld returned 1 exit status |
| 9 | |
| 10 | This is because os.o was built twice: |
| 11 | * The implicity rule (depends on unix/os.o) |
| 12 | * The "make all" in unix subdir (depends on unix/os.o) |
| 13 | |
| 14 | Depend on subdirs which is unix only rather than unix/os.o will fix the |
| 15 | problem. |
| 16 | |
| 17 | Upstream-Status: Pending |
| 18 | |
| 19 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
| 20 | --- |
| 21 | bin/confgen/Makefile.in | 4 ++-- |
| 22 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 23 | |
| 24 | diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in |
| 25 | index 8b3e5aa..4868a24 100644 |
| 26 | --- a/bin/confgen/Makefile.in |
| 27 | +++ b/bin/confgen/Makefile.in |
| 28 | @@ -74,11 +74,11 @@ rndc-confgen.@O@: rndc-confgen.c |
| 29 | ddns-confgen.@O@: ddns-confgen.c |
| 30 | ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c ${srcdir}/ddns-confgen.c |
| 31 | |
| 32 | -rndc-confgen@EXEEXT@: rndc-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS} ${CONFDEPLIBS} |
| 33 | +rndc-confgen@EXEEXT@: rndc-confgen.@O@ util.@O@ keygen.@O@ ${CONFDEPLIBS} $(SUBDIRS) |
| 34 | export BASEOBJS="rndc-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS}"; \ |
| 35 | ${FINALBUILDCMD} |
| 36 | |
| 37 | -ddns-confgen@EXEEXT@: ddns-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS} ${CONFDEPLIBS} |
| 38 | +ddns-confgen@EXEEXT@: ddns-confgen.@O@ util.@O@ keygen.@O@ ${CONFDEPLIBS} $(SUBDIRS) |
| 39 | export BASEOBJS="ddns-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS}"; \ |
| 40 | ${FINALBUILDCMD} |
| 41 | |
| 42 | -- |
| 43 | 1.7.9.5 |
| 44 | |