1*4882a593SmuzhiyunFrom b27c253bfb78fa3c5f416e6caee101098a4b58cc Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Khem Raj <raj.khem@gmail.com> 3*4882a593SmuzhiyunDate: Wed, 12 Jul 2017 18:09:46 -0700 4*4882a593SmuzhiyunSubject: [PATCH] build: Adjust CFLAGS/LDFLAGS to append values passed from env 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunFor musl we have to pass additional arguments via cflags and ldflags 7*4882a593Smuzhiyunto link in librirpc, make room for those changes to take effect 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com> 10*4882a593Smuzhiyun 11*4882a593Smuzhiyun--- 12*4882a593Smuzhiyun scripts/build | 2 +- 13*4882a593Smuzhiyun src/Makefile | 14 +++++++------- 14*4882a593Smuzhiyun 2 files changed, 8 insertions(+), 8 deletions(-) 15*4882a593Smuzhiyun 16*4882a593Smuzhiyundiff --git a/scripts/build b/scripts/build 17*4882a593Smuzhiyunindex 34a1371..3786741 100755 18*4882a593Smuzhiyun--- a/scripts/build 19*4882a593Smuzhiyun+++ b/scripts/build 20*4882a593Smuzhiyun@@ -18,7 +18,7 @@ done 21*4882a593Smuzhiyun 22*4882a593Smuzhiyun trap 'rm -f ${BASE}$$.s ${BASE}$$.c ${BASE}$$.o ${BASE}$$; exit 1' 1 2 15 23*4882a593Smuzhiyun 24*4882a593Smuzhiyun-LDLIBS=-lm 25*4882a593Smuzhiyun+LDLIBS="$LDLIBS -lm" 26*4882a593Smuzhiyun 27*4882a593Smuzhiyun # check for HP-UX's ANSI compiler 28*4882a593Smuzhiyun echo "main(int ac, char *av[]) { int i; }" > ${BASE}$$.c 29*4882a593Smuzhiyundiff --git a/src/Makefile b/src/Makefile 30*4882a593Smuzhiyunindex d9efd54..96467d7 100644 31*4882a593Smuzhiyun--- a/src/Makefile 32*4882a593Smuzhiyun+++ b/src/Makefile 33*4882a593Smuzhiyun@@ -112,8 +112,8 @@ LIBOBJS= $O/lib_tcp.o $O/lib_udp.o $O/lib_unix.o $O/lib_timing.o \ 34*4882a593Smuzhiyun $O/lib_sched.o 35*4882a593Smuzhiyun 36*4882a593Smuzhiyun lmbench: $(UTILS) 37*4882a593Smuzhiyun- @env CFLAGS=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="$(CC)" OS="$(OS)" ../scripts/build all 38*4882a593Smuzhiyun- -@env CFLAGS=-O MAKE="$(MAKE)" MAKEFLAGS="k$(MAKEFLAGS)" CC="$(CC)" OS="$(OS)" ../scripts/build opt 39*4882a593Smuzhiyun+ @env CFLAGS+=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="$(CC)" OS="$(OS)" ../scripts/build all 40*4882a593Smuzhiyun+ -@env CFLAGS+=-O MAKE="$(MAKE)" MAKEFLAGS="k$(MAKEFLAGS)" CC="$(CC)" OS="$(OS)" ../scripts/build opt 41*4882a593Smuzhiyun 42*4882a593Smuzhiyun results: lmbench 43*4882a593Smuzhiyun @env OS="${OS}" ../scripts/config-run 44*4882a593Smuzhiyun@@ -137,7 +137,7 @@ os: lmbench 45*4882a593Smuzhiyun @env OS="${OS}" BENCHMARK_HARDWARE=NO BENCHMARK_OS=YES ../scripts/results 46*4882a593Smuzhiyun 47*4882a593Smuzhiyun install: lmbench 48*4882a593Smuzhiyun- @env CFLAGS=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="${CC}" OS="${OS}" ../scripts/build install-target 49*4882a593Smuzhiyun+ @env CFLAGS+=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="${CC}" OS="${OS}" ../scripts/build install-target 50*4882a593Smuzhiyun 51*4882a593Smuzhiyun install-target: 52*4882a593Smuzhiyun if [ ! -d $(BASE) ]; then mkdir $(BASE); fi 53*4882a593Smuzhiyun@@ -155,16 +155,16 @@ all: $(EXES) $O/lmbench 54*4882a593Smuzhiyun opt: $(OPT_EXES) 55*4882a593Smuzhiyun asm: $(ASMS) 56*4882a593Smuzhiyun $(ASMS): 57*4882a593Smuzhiyun- $(CC) -S $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ `basename $@ .s`.c 58*4882a593Smuzhiyun+ $(CC) -S $(CFLAGS) $(CPPFLAGS) -o $@ `basename $@ .s`.c $(LDFLAGS) 59*4882a593Smuzhiyun 60*4882a593Smuzhiyun Wall: 61*4882a593Smuzhiyun- @env CFLAGS="-g -O -Wall" MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="${CC}" OS="${OS}" ../scripts/build all opt 62*4882a593Smuzhiyun+ @env CFLAGS+="-g -O -Wall" MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="${CC}" OS="${OS}" ../scripts/build all opt 63*4882a593Smuzhiyun 64*4882a593Smuzhiyun debug: 65*4882a593Smuzhiyun- @env CFLAGS="-g -O -DDEBUG" MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="${CC}" OS="${OS}" ../scripts/build all opt 66*4882a593Smuzhiyun+ @env CFLAGS+="-g -O -DDEBUG" MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="${CC}" OS="${OS}" ../scripts/build all opt 67*4882a593Smuzhiyun 68*4882a593Smuzhiyun assembler: 69*4882a593Smuzhiyun- @env CFLAGS=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="${CC}" OS="${OS}" ../scripts/build asm 70*4882a593Smuzhiyun+ @env CFLAGS+=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="${CC}" OS="${OS}" ../scripts/build asm 71*4882a593Smuzhiyun 72*4882a593Smuzhiyun 73*4882a593Smuzhiyun tag: 74