From a198eedcc7b7f5d19c0ffcbe7514aa88de2ec0cb Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Mon, 25 Mar 2013 21:14:17 -0400 Subject: [PATCH] Fix incorrect version checks. It's sufficient to simply check if the gcc version is 4 or higher since we enforce the use of the latest ported compiler for the build anyways, and these multi-level checks would fail in their current state if gcc moved to e.g. version 5.0. --- build/jam/BuildSetup | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index 6588093324..b839e350cc 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -142,9 +142,7 @@ if $(HAIKU_GCC_VERSION[1]) >= 3 { # too many false positives. Coverity does a better job of this kind of analysis # anyways. if $(HAIKU_GCC_VERSION[1]) >= 4 { - if $(HAIKU_GCC_VERSION[2]) >= 6 { - HAIKU_GCC_BASE_FLAGS += -Wno-array-bounds ; - } + HAIKU_GCC_BASE_FLAGS += -Wno-array-bounds ; } if $(HOST_GCC_VERSION[1]) >= 3 { @@ -362,12 +360,10 @@ if $(HAIKU_GCC_VERSION[1]) >= 3 { if $(HAIKU_GCC_VERSION[1]) >= 4 { HAIKU_C++FLAGS += -Wno-deprecated ; - if $(HAIKU_GCC_VERSION[2]) >= 3 { - HAIKU_KERNEL_CCFLAGS += -ffreestanding ; - HAIKU_KERNEL_C++FLAGS += -ffreestanding ; - HAIKU_BOOT_CCFLAGS += -ffreestanding ; - HAIKU_BOOT_C++FLAGS += -ffreestanding ; - } + HAIKU_KERNEL_CCFLAGS += -ffreestanding ; + HAIKU_KERNEL_C++FLAGS += -ffreestanding ; + HAIKU_BOOT_CCFLAGS += -ffreestanding ; + HAIKU_BOOT_C++FLAGS += -ffreestanding ; } HAIKU_KERNEL_PIC_CCFLAGS = -fno-pic ; @@ -1261,10 +1257,8 @@ if $(HAIKU_GCC_VERSION[1]) >= 4 { # -Wuninitialized gives too many false positives. HAIKU_WERRORFLAGS = -Wno-error=uninitialized ; - if $(HAIKU_GCC_VERSION[2]) >= 6 { - # TODO: remove the -Wno-unused-but-set-variable option - HAIKU_WERRORFLAGS += -Wno-unused-but-set-variable ; - } + # TODO: remove the -Wno-unused-but-set-variable option + HAIKU_WERRORFLAGS += -Wno-unused-but-set-variable ; } rule EnableWerror dirTokens : scope {