Update: Build settings to be consistent with latest build settings changes.

diff --git a/data/build/remove/settings b/data/build/remove/settings
index 49f5db6e6883938dc59801c36fdb46e40201201c..04d41d2e15102c940e225e2020d62dbace487662 100644 (file)
--- a/data/build/remove/settings
+++ b/data/build/remove/settings
@@ -8,8 +8,10 @@
 #   - level:             Compile using per level libraries.
 #   - monolithic:        Compile using per monolithic libraries.
 #   - clang:             Use clang rather than the default, which is generally gcc.
+#   - gcc:               Use gcc specific settings.
 #   - test:              Compile for a test, such as unit testing.
 #   - fanalyzer:         Compile using GCC's -fanalyzer compile time option.
+#   - coverage:          Compile for building coverage.
 #   - thread:            Compile with thread support.
 #   - threadless:        Compile without thread support.
 #
@@ -22,8 +24,8 @@ version_micro 0
 version_file micro
 version_target minor
 
-modes individual individual_thread level monolithic clang test fanalyzer thread threadless
-modes_default monolithic thread
+modes individual individual_thread level monolithic clang gcc test fanalyzer coverage thread threadless
+modes_default monolithic thread gcc
 
 build_compiler gcc
 build_compiler-clang clang
@@ -76,10 +78,14 @@ defines -D_libcap_legacy_only_
 defines-threadless -D_di_thread_support_
 defines-thread -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_
 
-flags -O2 -z now -g -fdiagnostics-color=always -Wno-logical-not-parentheses -Wno-parentheses -Wno-missing-braces
+flags -O2 -g -fdiagnostics-color=always -Wno-logical-not-parentheses -Wno-parentheses -Wno-missing-braces
+flags -fstack-clash-protection -fno-delete-null-pointer-checks
+flags -D_FORTIFY_SOURCE=3
+flags -Wl,-z,nodlopen -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now
 flags-thread -pthread
 flags-clang -Wno-logical-op-parentheses
-flags-test -O0 -fstack-protector -Wall
+flags-gcc -fstrict-flex-arrays=3
+flags-test -O0 -fstack-protector-strong -Wall
 flags-fanalyzer -fanalyzer
 flags-coverage -O0 --coverage -fprofile-abs-path -fprofile-dir=build/coverage/
 

diff --git a/data/build/tacocat/settings b/data/build/tacocat/settings
index 02aaf98cb78714815367bcacbbc6eacb170ddcef..e88e80cb7706a4af935090cabfd123dc18745af1 100644 (file)
--- a/data/build/tacocat/settings
+++ b/data/build/tacocat/settings
@@ -8,6 +8,7 @@
 #   - level:             Compile using per level libraries.
 #   - monolithic:        Compile using per monolithic libraries.
 #   - clang:             Use clang rather than the default, which is generally gcc
+#   - gcc:               Use gcc specific settings.
 #   - test:              Compile for a test, such as unit testing.
 #   - fanalyzer:         Compile using GCC's -fanalyzer compile time option.
 #   - coverage:          Compile for building coverage.
@@ -23,8 +24,8 @@ version_micro 0
 version_file micro
 version_target minor
 
-modes individual individual_thread level monolithic clang test fanalyzer coverage thread threadless
-modes_default monolithic thread
+modes individual individual_thread level monolithic clang gcc test fanalyzer coverage thread threadless
+modes_default monolithic thread gcc
 
 build_compiler gcc
 build_compiler-clang clang
@@ -78,14 +79,14 @@ environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY L
 defines -D_libcap_legacy_only_
 defines-threadless -D_di_thread_support_
 defines-thread -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_
-defines-individual_thread -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_
 
 flags -O2 -g -fdiagnostics-color=always -Wno-logical-not-parentheses -Wno-parentheses
-flags -fstack-clash-protection -fno-delete-null-pointer-checks -fstrict-flex-arrays=3
+flags -fstack-clash-protection -fno-delete-null-pointer-checks
 flags -D_FORTIFY_SOURCE=3
 flags -Wl,-z,nodlopen -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now
 flags-thread -pthread
 flags-clang -Wno-logical-op-parentheses
+flags-gcc -fstrict-flex-arrays=3
 flags-test -O0 -fstack-protector-strong -Wall
 flags-fanalyzer -fanalyzer
 flags-coverage -O0 --coverage -fprofile-abs-path -fprofile-dir=build/coverage/