| From b27c253bfb78fa3c5f416e6caee101098a4b58cc Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Wed, 12 Jul 2017 18:09:46 -0700 |
| Subject: [PATCH] build: Adjust CFLAGS/LDFLAGS to append values passed from env |
| |
| For musl we have to pass additional arguments via cflags and ldflags |
| to link in librirpc, make room for those changes to take effect |
| |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| |
| --- |
| scripts/build | 2 +- |
| src/Makefile | 14 +++++++------- |
| 2 files changed, 8 insertions(+), 8 deletions(-) |
| |
| diff --git a/scripts/build b/scripts/build |
| index 34a1371..3786741 100755 |
| --- a/scripts/build |
| +++ b/scripts/build |
| @@ -18,7 +18,7 @@ done |
| |
| trap 'rm -f ${BASE}$$.s ${BASE}$$.c ${BASE}$$.o ${BASE}$$; exit 1' 1 2 15 |
| |
| -LDLIBS=-lm |
| +LDLIBS+=-lm |
| |
| # check for HP-UX's ANSI compiler |
| echo "main(int ac, char *av[]) { int i; }" > ${BASE}$$.c |
| diff --git a/src/Makefile b/src/Makefile |
| index d9efd54..96467d7 100644 |
| --- a/src/Makefile |
| +++ b/src/Makefile |
| @@ -112,8 +112,8 @@ LIBOBJS= $O/lib_tcp.o $O/lib_udp.o $O/lib_unix.o $O/lib_timing.o \ |
| $O/lib_sched.o |
| |
| lmbench: $(UTILS) |
| - @env CFLAGS=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="$(CC)" OS="$(OS)" ../scripts/build all |
| - -@env CFLAGS=-O MAKE="$(MAKE)" MAKEFLAGS="k$(MAKEFLAGS)" CC="$(CC)" OS="$(OS)" ../scripts/build opt |
| + @env CFLAGS+=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="$(CC)" OS="$(OS)" ../scripts/build all |
| + -@env CFLAGS+=-O MAKE="$(MAKE)" MAKEFLAGS="k$(MAKEFLAGS)" CC="$(CC)" OS="$(OS)" ../scripts/build opt |
| |
| results: lmbench |
| @env OS="${OS}" ../scripts/config-run |
| @@ -137,7 +137,7 @@ os: lmbench |
| @env OS="${OS}" BENCHMARK_HARDWARE=NO BENCHMARK_OS=YES ../scripts/results |
| |
| install: lmbench |
| - @env CFLAGS=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="${CC}" OS="${OS}" ../scripts/build install-target |
| + @env CFLAGS+=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="${CC}" OS="${OS}" ../scripts/build install-target |
| |
| install-target: |
| if [ ! -d $(BASE) ]; then mkdir $(BASE); fi |
| @@ -155,16 +155,16 @@ all: $(EXES) $O/lmbench |
| opt: $(OPT_EXES) |
| asm: $(ASMS) |
| $(ASMS): |
| - $(CC) -S $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ `basename $@ .s`.c |
| + $(CC) -S $(CFLAGS) $(CPPFLAGS) -o $@ `basename $@ .s`.c $(LDFLAGS) |
| |
| Wall: |
| - @env CFLAGS="-g -O -Wall" MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="${CC}" OS="${OS}" ../scripts/build all opt |
| + @env CFLAGS+="-g -O -Wall" MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="${CC}" OS="${OS}" ../scripts/build all opt |
| |
| debug: |
| - @env CFLAGS="-g -O -DDEBUG" MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="${CC}" OS="${OS}" ../scripts/build all opt |
| + @env CFLAGS+="-g -O -DDEBUG" MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="${CC}" OS="${OS}" ../scripts/build all opt |
| |
| assembler: |
| - @env CFLAGS=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="${CC}" OS="${OS}" ../scripts/build asm |
| + @env CFLAGS+=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="${CC}" OS="${OS}" ../scripts/build asm |
| |
| |
| tag: |