From: Zijie Pan <zijie....@6wind.com> In rte.toolchain-compat.mk, ensure MACHINE_CFLAGS is initialized when using GCC 4.7. Update the GCC 4.6 test to also include GCC 4.7.
Acked-by: Ivan Boule <ivan.boule at 6wind.com> Acked-by: Adrien Mazarguil <adrien.mazarguil at 6wind.com> Signed-off-by: Krzysztof Witek <krzysztof.witek at 6wind.com> Signed-off-by: Zijie Pan <zijie.pan at 6wind.com> --- mk/toolchain/gcc/rte.toolchain-compat.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mk/toolchain/gcc/rte.toolchain-compat.mk b/mk/toolchain/gcc/rte.toolchain-compat.mk index 2e05ecb..137659d 100644 --- a/mk/toolchain/gcc/rte.toolchain-compat.mk +++ b/mk/toolchain/gcc/rte.toolchain-compat.mk @@ -59,7 +59,7 @@ else # GCC 4.6.x - added support for corei7, corei7-avx # GCC 4.7.x - added support for fsgsbase, rdrnd, f16c, core-avx-i, core-avx2 - ifeq ($(shell test $(GCC_MINOR_VERSION) -lt 7 && echo 1), 1) + ifeq ($(shell test $(GCC_MINOR_VERSION) -le 7 && echo 1), 1) MACHINE_CFLAGS := $(patsubst -march=core-avx-i,-march=corei7-avx,$(MACHINE_CFLAGS)) MACHINE_CFLAGS := $(patsubst -march=core-avx2,-march=corei7-avx,$(MACHINE_CFLAGS)) endif -- 1.7.2.5