1*4882a593SmuzhiyunFrom 6b822b36739222d0c864249992b5d28e3ff4d948 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Adrian Friedli <adrian.friedli@husqvarnagroup.com> 3*4882a593SmuzhiyunDate: Mon, 3 Sep 2018 17:58:27 +0200 4*4882a593SmuzhiyunSubject: [PATCH] Use toolchain from environment variables 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunUpstream-Status: Submitted [https://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT/pull/42] 7*4882a593SmuzhiyunSigned-off-by: Adrian Friedli <adrian.friedli@husqvarnagroup.com> 8*4882a593SmuzhiyunSigned-off-by: Ankit Navik <ankit.tarot@gmail.com> 9*4882a593Smuzhiyun--- 10*4882a593Smuzhiyun Makefile.inc | 7 ++++--- 11*4882a593Smuzhiyun WTGService/Makefile | 2 +- 12*4882a593Smuzhiyun console_src/Makefile | 2 +- 13*4882a593Smuzhiyun lib/Makefile | 6 +++--- 14*4882a593Smuzhiyun 4 files changed, 9 insertions(+), 8 deletions(-) 15*4882a593Smuzhiyun 16*4882a593Smuzhiyundiff --git a/Makefile.inc b/Makefile.inc 17*4882a593Smuzhiyunindex b0edf5a..0094bdf 100644 18*4882a593Smuzhiyun--- a/Makefile.inc 19*4882a593Smuzhiyun+++ b/Makefile.inc 20*4882a593Smuzhiyun@@ -13,14 +13,15 @@ 21*4882a593Smuzhiyun # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE 22*4882a593Smuzhiyun # USE OR PERFORMANCE OF THIS SOFTWARE. 23*4882a593Smuzhiyun # 24*4882a593Smuzhiyun-CC = gcc 25*4882a593Smuzhiyun+CC ?= gcc 26*4882a593Smuzhiyun+AR ?= ar 27*4882a593Smuzhiyun LIB=lib 28*4882a593Smuzhiyun DUT=dut 29*4882a593Smuzhiyun CA=ca 30*4882a593Smuzhiyun UCC=ucc 31*4882a593Smuzhiyun CON=console_src 32*4882a593Smuzhiyun WTG=WTGService 33*4882a593Smuzhiyun-MAKE=make 34*4882a593Smuzhiyun+MAKE?=make 35*4882a593Smuzhiyun 36*4882a593Smuzhiyun # This is for WMM-PS 37*4882a593Smuzhiyun #for Ext TG 38*4882a593Smuzhiyun@@ -46,7 +47,7 @@ CFLAGS = -g -O2 -D_REENTRANT -Wall -I../inc 39*4882a593Smuzhiyun 40*4882a593Smuzhiyun DUTLIBS = ../lib/libwfa_dut.a -lpthread 41*4882a593Smuzhiyun CALIBS = ../lib/libwfa_ca.a -lpthread 42*4882a593Smuzhiyun-RANLIB = ranlib 43*4882a593Smuzhiyun+RANLIB ?= ranlib 44*4882a593Smuzhiyun 45*4882a593Smuzhiyun LIBWFA_NAME_DUT = libwfa_dut.a 46*4882a593Smuzhiyun LIBWFA_NAME_CA = libwfa_ca.a 47*4882a593Smuzhiyundiff --git a/WTGService/Makefile b/WTGService/Makefile 48*4882a593Smuzhiyunindex 5312eb6..4855771 100644 49*4882a593Smuzhiyun--- a/WTGService/Makefile 50*4882a593Smuzhiyun+++ b/WTGService/Makefile 51*4882a593Smuzhiyun@@ -13,7 +13,7 @@ 52*4882a593Smuzhiyun # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE 53*4882a593Smuzhiyun # USE OR PERFORMANCE OF THIS SOFTWARE. 54*4882a593Smuzhiyun # 55*4882a593Smuzhiyun-CC=gcc 56*4882a593Smuzhiyun+CC?=gcc 57*4882a593Smuzhiyun CFLAGS= -Wall 58*4882a593Smuzhiyun LIB=-lpthread 59*4882a593Smuzhiyun 60*4882a593Smuzhiyundiff --git a/console_src/Makefile b/console_src/Makefile 61*4882a593Smuzhiyunindex 8282283..d1098eb 100644 62*4882a593Smuzhiyun--- a/console_src/Makefile 63*4882a593Smuzhiyun+++ b/console_src/Makefile 64*4882a593Smuzhiyun@@ -14,7 +14,7 @@ 65*4882a593Smuzhiyun # USE OR PERFORMANCE OF THIS SOFTWARE. 66*4882a593Smuzhiyun # 67*4882a593Smuzhiyun 68*4882a593Smuzhiyun-CC = gcc 69*4882a593Smuzhiyun+CC ?= gcc 70*4882a593Smuzhiyun CFLAGS = -g -DWFA_DEBUG -pthread 71*4882a593Smuzhiyun 72*4882a593Smuzhiyun TARGETS = wfa_con 73*4882a593Smuzhiyundiff --git a/lib/Makefile b/lib/Makefile 74*4882a593Smuzhiyunindex ffcef94..299b8d6 100644 75*4882a593Smuzhiyun--- a/lib/Makefile 76*4882a593Smuzhiyun+++ b/lib/Makefile 77*4882a593Smuzhiyun@@ -17,9 +17,9 @@ 78*4882a593Smuzhiyun include ../Makefile.inc 79*4882a593Smuzhiyun 80*4882a593Smuzhiyun all: ${LIB_OBJS} 81*4882a593Smuzhiyun- ar crv ${LIBWFA_NAME} $? 82*4882a593Smuzhiyun- ar crv ${LIBWFA_NAME_DUT} ${LIB_OBJS_DUT} 83*4882a593Smuzhiyun- ar crv ${LIBWFA_NAME_CA} ${LIB_OBJS_CA} 84*4882a593Smuzhiyun+ $(AR) crv ${LIBWFA_NAME} $? 85*4882a593Smuzhiyun+ $(AR) crv ${LIBWFA_NAME_DUT} ${LIB_OBJS_DUT} 86*4882a593Smuzhiyun+ $(AR) crv ${LIBWFA_NAME_CA} ${LIB_OBJS_CA} 87*4882a593Smuzhiyun ${RANLIB} ${LIBWFA_NAME} ${LIBWFA_NAME_DUT} ${LIBWFA_NAME_CA} 88*4882a593Smuzhiyun 89*4882a593Smuzhiyun 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 90*4882a593Smuzhiyun-- 91*4882a593Smuzhiyun2.7.4 92*4882a593Smuzhiyun 93