diff --git a/cmake/flags-gcc-aarch64.cmake b/cmake/flags-gcc-aarch64.cmake
index 5e37b9c3f..146a869fc 100644
--- a/cmake/flags-gcc-aarch64.cmake
+++ b/cmake/flags-gcc-aarch64.cmake
@@ -14,7 +14,7 @@
 #           Copyright 2021 David Hrdlička.
 #
 
-include(${CMAKE_CURRENT_LIST_DIR}/flags-gcc.cmake)
+string(APPEND CMAKE_C_FLAGS_INIT    " -march=armv8-a -mfloat-abi=hard")
+string(APPEND CMAKE_CXX_FLAGS_INIT  " -march=armv8-a -mfloat-abi=hard")
 
-set(CMAKE_C_FLAGS_INIT      "-march=armv8-a -mfloat-abi=hard ${CMAKE_C_FLAGS_INIT}")
-set(CMAKE_CXX_FLAGS_INIT    "-march=armv8-a -mfloat-abi=hard ${CMAKE_CXX_FLAGS_INIT}")
\ No newline at end of file
+include(${CMAKE_CURRENT_LIST_DIR}/flags-gcc.cmake)
\ No newline at end of file
diff --git a/cmake/flags-gcc-armv7.cmake b/cmake/flags-gcc-armv7.cmake
index 4ee436c35..bd49fdfce 100644
--- a/cmake/flags-gcc-armv7.cmake
+++ b/cmake/flags-gcc-armv7.cmake
@@ -14,7 +14,7 @@
 #           Copyright 2021 David Hrdlička.
 #
 
-include(${CMAKE_CURRENT_LIST_DIR}/flags-gcc.cmake)
+string(APPEND CMAKE_C_FLAGS_INIT    " -march=armv7-a -mfloat-abi=hard ${CMAKE_C_FLAGS_INIT}")
+string(APPEND CMAKE_CXX_FLAGS_INIT  " -march=armv7-a -mfloat-abi=hard ${CMAKE_CXX_FLAGS_INIT}")
 
-set(CMAKE_C_FLAGS_INIT      "-march=armv7-a -mfloat-abi=hard ${CMAKE_C_FLAGS_INIT}")
-set(CMAKE_CXX_FLAGS_INIT    "-march=armv7-a -mfloat-abi=hard ${CMAKE_CXX_FLAGS_INIT}")
\ No newline at end of file
+include(${CMAKE_CURRENT_LIST_DIR}/flags-gcc.cmake)
\ No newline at end of file
diff --git a/cmake/flags-gcc-i686.cmake b/cmake/flags-gcc-i686.cmake
index 9c508f17b..6d1afd6a9 100644
--- a/cmake/flags-gcc-i686.cmake
+++ b/cmake/flags-gcc-i686.cmake
@@ -14,7 +14,7 @@
 #           Copyright 2021 David Hrdlička.
 #
 
-include(${CMAKE_CURRENT_LIST_DIR}/flags-gcc.cmake)
+string(APPEND CMAKE_C_FLAGS_INIT    " -m32 -march=i686 -msse2 -mfpmath=sse ${CMAKE_C_FLAGS_INIT}")
+string(APPEND CMAKE_CXX_FLAGS_INIT  " -m32 -march=i686 -msse2 -mfpmath=sse ${CMAKE_CXX_FLAGS_INIT}")
 
-set(CMAKE_C_FLAGS_INIT      "-m32 -march=i686 -msse2 -mfpmath=sse ${CMAKE_C_FLAGS_INIT}")
-set(CMAKE_CXX_FLAGS_INIT    "-m32 -march=i686 -msse2 -mfpmath=sse ${CMAKE_CXX_FLAGS_INIT}")
\ No newline at end of file
+include(${CMAKE_CURRENT_LIST_DIR}/flags-gcc.cmake)
diff --git a/cmake/flags-gcc-x86_64.cmake b/cmake/flags-gcc-x86_64.cmake
index 4edd2ec79..e373a1fec 100644
--- a/cmake/flags-gcc-x86_64.cmake
+++ b/cmake/flags-gcc-x86_64.cmake
@@ -14,7 +14,7 @@
 #           Copyright 2021 David Hrdlička.
 #
 
-include(${CMAKE_CURRENT_LIST_DIR}/flags-gcc.cmake)
+string(APPEND CMAKE_C_FLAGS_INIT    " -m64 -march=x86-64 -msse2 -mfpmath=sse ${CMAKE_C_FLAGS_INIT}")
+string(APPEND CMAKE_CXX_FLAGS_INIT  " -m64 -march=x86-64 -msse2 -mfpmath=sse ${CMAKE_CXX_FLAGS_INIT}")
 
-set(CMAKE_C_FLAGS_INIT      "-m64 -march=x86-64 -msse2 -mfpmath=sse ${CMAKE_C_FLAGS_INIT}")
-set(CMAKE_CXX_FLAGS_INIT    "-m64 -march=x86-64 -msse2 -mfpmath=sse ${CMAKE_CXX_FLAGS_INIT}")
\ No newline at end of file
+include(${CMAKE_CURRENT_LIST_DIR}/flags-gcc.cmake)
diff --git a/cmake/flags-gcc.cmake b/cmake/flags-gcc.cmake
index bebe58f2a..aa3d933f6 100644
--- a/cmake/flags-gcc.cmake
+++ b/cmake/flags-gcc.cmake
@@ -13,13 +13,21 @@
 #           Copyright 2021 David Hrdlička.
 #
 
-set(CMAKE_CONFIGURATION_TYPES       Debug;Release;Optimized)
+# Define our flags
+string(APPEND CMAKE_C_FLAGS_INIT                " -fomit-frame-pointer -mstackrealign -Wall -fno-strict-aliasing")
+string(APPEND CMAKE_CXX_FLAGS_INIT              " -fomit-frame-pointer -mstackrealign -Wall -fno-strict-aliasing")
+string(APPEND CMAKE_C_FLAGS_RELEASE_INIT        " -g0 -O3")
+string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT      " -g0 -O3")
+string(APPEND CMAKE_C_FLAGS_DEBUG_INIT          " -ggdb -Og")
+string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT        " -ggdb -Og")
+string(APPEND CMAKE_C_FLAGS_OPTIMIZED_INIT      " -march=native -mtune=native -O3 -ffp-contract=fast -flto")
+string(APPEND CMAKE_CXX_FLAGS_OPTIMIZED_INIT    " -march=native -mtune=native -O3 -ffp-contract=fast -flto")
 
-set(CMAKE_C_FLAGS_INIT              "-fomit-frame-pointer -mstackrealign -Wall -fno-strict-aliasing")
-set(CMAKE_CXX_FLAGS_INIT            ${CMAKE_C_FLAGS_INIT})
-set(CMAKE_C_FLAGS_RELEASE_INIT      "-g0 -O3")
-set(CMAKE_CXX_FLAGS_RELEASE_INIT    ${CMAKE_C_FLAGS_RELEASE_INIT})
-set(CMAKE_C_FLAGS_DEBUG_INIT        "-ggdb -Og")
-set(CMAKE_CXX_FLAGS_DEBUG_INIT      ${CMAKE_C_FLAGS_DEBUG_INIT})
-set(CMAKE_C_FLAGS_OPTIMIZED_INIT    "-march=native -mtune=native -O3 -ffp-contract=fast -flto")
-set(CMAKE_CXX_FLAGS_OPTIMIZED_INIT  ${CMAKE_C_FLAGS_OPTIMIZED_INIT})
\ No newline at end of file
+# Set up the variables
+foreach(LANG C;CXX)
+    set(CMAKE_${LANG}_FLAGS "$ENV{${LANG}FLAGS} ${CMAKE_${LANG}_FLAGS_INIT}" CACHE STRING "Flags used by the ${LANG} compiler during all build types.")
+
+    foreach(CONFIG RELEASE;DEBUG;OPTIMIZED)
+        set(CMAKE_${LANG}_FLAGS_${CONFIG} "${CMAKE_${LANG}_FLAGS_${CONFIG}_INIT}" CACHE STRING "Flags used by the ${LANG} compiler during ${CONFIG} builds.")
+    endforeach()
+endforeach()
\ No newline at end of file