build : fix gcc build

Author: cebtenzzre

CMakeLists.txt

@@ -414,10 +414,11 @@ if (LLAMA_ALL_WARNINGS)
             -Wextra
             -Wpedantic
             -Wcast-qual
-            -Wunreachable-code-break
-            -Wunreachable-code-return
-            -Wextra-semi
+            -Wno-unused-function
         )
+        if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")  # clang++ only
+            set(warning_flags ${warning_flags} -Wunreachable-code-break -Wunreachable-code-return)
+        endif()
         set(c_flags
             ${warning_flags}
             -Wdouble-promotion
@@ -426,17 +427,15 @@ if (LLAMA_ALL_WARNINGS)
             -Wpointer-arith
             -Wmissing-prototypes
             -Werror=implicit-int
-            -Wno-unused-function
         )
         set(cxx_flags
             ${warning_flags}
             -Wmissing-declarations
             -Wmissing-noreturn
-            -Wrange-loop-bind-reference
-            -Wno-unused-function
+            -Wextra-semi
         )
         if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")  # clang++ only
-            set(cxx_flags ${cxx_flags} -Wmissing-prototypes)
+            set(cxx_flags ${cxx_flags} -Wmissing-prototypes -Wrange-loop-bind-reference)
         elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")  # g++ only
             set(cxx_flags ${cxx_flags} -Wno-format-truncation -Wno-array-bounds)
         endif()

Makefile

@@ -170,18 +170,18 @@ ifdef LLAMA_DISABLE_LOGS
 endif # LLAMA_DISABLE_LOGS
 
 # warnings
-WARN_FLAGS    = -Wall -Wextra -Wpedantic -Wcast-qual -Wno-unused-function -Wunreachable-code-break \
-				-Wunreachable-code-return -Wextra-semi
+WARN_FLAGS    = -Wall -Wextra -Wpedantic -Wcast-qual -Wno-unused-function
 MK_CFLAGS    += $(WARN_FLAGS) -Wdouble-promotion -Wshadow -Wstrict-prototypes -Wpointer-arith -Wmissing-prototypes \
 				-Werror=implicit-int
-MK_CXXFLAGS  += $(WARN_FLAGS) -Wmissing-declarations -Wmissing-noreturn -Wrange-loop-bind-reference
+MK_CXXFLAGS  += $(WARN_FLAGS) -Wmissing-declarations -Wmissing-noreturn -Wextra-semi
 
 # TODO(cebtenzzre): remove this once PR #2632 gets merged
 TTFS_CXXFLAGS = $(CXXFLAGS) -Wno-missing-declarations
 
 ifneq '' '$(findstring clang,$(shell $(CXX) --version))'
 	# clang++ only
-	MK_CXXFLAGS   += -Wmissing-prototypes
+	WARN_FLAGS    += -Wunreachable-code-break -Wunreachable-code-return
+	MK_CXXFLAGS   += -Wmissing-prototypes -Wrange-loop-bind-reference
 	TTFS_CXXFLAGS += -Wno-missing-prototypes
 else
 	# g++ only