0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch 2.8 KB

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