From b3328adec3e2387d5a9c0187ea21cd55d91e58d2 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Tue, 9 Dec 2025 22:25:05 -0600 Subject: [PATCH] Refactor: Build mode gcc_13 to flex_arrays to provide a more generic name. The `gcc_13` was a temporary mode and I don't want to have version specific modes. Replace the mode witha more long term version unspecific name `flex_arrays`. --- data/build/fakefile | 2 +- data/build/settings | 4 ++-- data/build/stand_alone/fakefile | 2 +- data/build/stand_alone/settings.firewall | 24 ++++++++++++------------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/data/build/fakefile b/data/build/fakefile index ef75214..2e14b9c 100644 --- a/data/build/fakefile +++ b/data/build/fakefile @@ -2,7 +2,7 @@ settings: fail exit - modes individual individual_thread level monolithic clang coverage fanalyzer gcc gcc_13 test thread threadless + modes android clang coverage debug fanalyzer flex_arrays gcc individual individual_thread level monolithic test thread threadless environment PATH LD_LIBRARY_PATH environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LOCPATH NLSPATH diff --git a/data/build/settings b/data/build/settings index 103215e..c64c2de 100644 --- a/data/build/settings +++ b/data/build/settings @@ -6,8 +6,8 @@ # - coverage: Compile for building coverage. # - debug: Enable debugging, such as compile time debug options. # - fanalyzer: Compile using GCC's -fanalyzer compile time option. +# - flex_arrays: Use GCC strict flex arrays (supported by GCC version 13 or greater). # - gcc: Use GCC specific settings. -# - gcc_13: Use GCC version 13 or greater specific settings. # - individual: Compile using per project (individual) libraries, does not handle thread or threadless cases. # - individual_thread: This is required when compiling in individual mode with "thread" mode. # - level: Compile using per level libraries. @@ -25,7 +25,7 @@ version_micro 4 version_file micro version_target minor -modes android clang coverage debug fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless +modes android clang coverage debug fanalyzer flex_arrays gcc individual individual_thread level monolithic test thread threadless modes_default debug gcc monolithic thread build_compiler gcc diff --git a/data/build/stand_alone/fakefile b/data/build/stand_alone/fakefile index faf7518..a1a84ea 100644 --- a/data/build/stand_alone/fakefile +++ b/data/build/stand_alone/fakefile @@ -13,7 +13,7 @@ settings: fail exit - modes clang coverage fanalyzer gcc gcc_13 test thread threadless + modes android clang coverage debug fanalyzer flex_arrays gcc test thread threadless environment PATH LD_LIBRARY_PATH environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LOCPATH NLSPATH diff --git a/data/build/stand_alone/settings.firewall b/data/build/stand_alone/settings.firewall index 9034413..6fc95d5 100644 --- a/data/build/stand_alone/settings.firewall +++ b/data/build/stand_alone/settings.firewall @@ -6,16 +6,16 @@ # fake -s data/build/stand_alone/settings.firewall clean build # # Modes: -# - android: Compile on an android system (using Termux; may need modification depending on the android system). -# - clang: Use CLang rather than the default, which is generally GCC. -# - coverage: Compile for building coverage. -# - debug: Enable debugging, such as compile time debug options. -# - fanalyzer: Compile using GCC's -fanalyzer compile time option. -# - gcc: Use GCC specific settings. -# - gcc_13: Use GCC version 13 or greater specific settings. -# - test: Compile for a test, such as unit testing. -# - thread: Compile with thread support. -# - threadless: Compile without thread support. +# - android: Compile on an android system (using Termux; may need modification depending on the android system). +# - clang: Use CLang rather than the default, which is generally GCC. +# - coverage: Compile for building coverage. +# - debug: Enable debugging, such as compile time debug options. +# - fanalyzer: Compile using GCC's -fanalyzer compile time option. +# - flex_arrays: Use GCC strict flex arrays (supported by GCC version 13 or greater). +# - gcc: Use GCC specific settings. +# - test: Compile for a test, such as unit testing. +# - thread: Compile with thread support. +# - threadless: Compile without thread support. # build_name firewall @@ -27,7 +27,7 @@ version_micro 0 version_file micro version_target minor -modes android clang coverage debug fanalyzer gcc gcc_13 test thread threadless +modes android clang coverage debug fanalyzer flex_arrays gcc test thread threadless modes_default debug gcc thread build_compiler gcc @@ -128,7 +128,7 @@ flags -Wl,-z,nodlopen -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now flags-android -Wno-implicit-function-declaration -Wl,-z,norelro flags-clang -Wno-logical-op-parentheses flags-fanalyzer -fanalyzer -flags-gcc_13 -fstrict-flex-arrays=3 +flags-flex_arrays -fstrict-flex-arrays=3 flags-test -O0 -fstack-protector-strong -Wall flags-thread -pthread -- 1.8.3.1