Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From cca2f9901fb4fdcdd49066fe434eae512964143f Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 9 Feb 2019 07:59:47 -0800 |
| 4 | Subject: [PATCH 4/4] run ranlib per library and use AR |
| 5 | |
| 6 | Use AR variable to invoke archiver instead of hardcoding, helps cross |
| 7 | compile |
| 8 | |
| 9 | compiler ranlib e.g. llvm-ranlib fails to operate on multiple archives |
| 10 | on single invocation |
| 11 | |
| 12 | fixes errors like |
| 13 | arm-yoe-linux-musleabi-llvm-ranlib: error: Exactly one archive should be specified. |
| 14 | |
| 15 | Upstream-Status: Submitted [https://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT/pull/47] |
| 16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 17 | --- |
| 18 | lib/Makefile | 4 +++- |
| 19 | 1 file changed, 3 insertions(+), 1 deletion(-) |
| 20 | |
| 21 | diff --git a/lib/Makefile b/lib/Makefile |
| 22 | index 299b8d6..5fca322 100644 |
| 23 | --- a/lib/Makefile |
| 24 | +++ b/lib/Makefile |
| 25 | @@ -20,7 +20,9 @@ all: ${LIB_OBJS} |
| 26 | $(AR) crv ${LIBWFA_NAME} $? |
| 27 | $(AR) crv ${LIBWFA_NAME_DUT} ${LIB_OBJS_DUT} |
| 28 | $(AR) crv ${LIBWFA_NAME_CA} ${LIB_OBJS_CA} |
| 29 | - ${RANLIB} ${LIBWFA_NAME} ${LIBWFA_NAME_DUT} ${LIBWFA_NAME_CA} |
| 30 | + ${RANLIB} ${LIBWFA_NAME} |
| 31 | + ${RANLIB} ${LIBWFA_NAME_DUT} |
| 32 | + ${RANLIB} ${LIBWFA_NAME_CA} |
| 33 | |
| 34 | wfa_tg.o: wfa_tg.c ../inc/wfa_agt.h ../inc/wfa_types.h ../inc/wfa_rsp.h ../inc/wfa_tlv.h ../inc/wfa_tg.h |
| 35 | |
| 36 | -- |
| 37 | 2.20.1 |
| 38 | |