Fixed Clang testing in CI, removed override vars in Makefile

Two flags introduced: -fcallgraph-info=su for stack analysis, and
-ftrack-macro-expansions=0 for cleaner prettyassert.py warnings, are
unfortunately not supported in Clang.

The override vars in the Makefile meant it wasn't actually possible to
remove these flags for Clang testing, so this commit changes those vars
to normal, non-overriding vars. This means `make CFLAGS=-Werror` and
`CFLAGS=-Werror make` behave _very_ differently, but this is just an
unfortunate quirk of make that needs to be worked around.
This commit is contained in:
Christopher Haster
2022-11-28 23:55:04 -06:00
parent 0c781dd822
commit 9990342440
4 changed files with 133 additions and 128 deletions
+6 -6
View File
@@ -1201,12 +1201,12 @@ static void list_implicit_defines(void) {
// geometries to bench
const bench_geometry_t builtin_geometries[] = {
{"default", {{NULL}, BENCH_CONST(16), BENCH_CONST(512), {NULL}}},
{"eeprom", {{NULL}, BENCH_CONST(1), BENCH_CONST(512), {NULL}}},
{"emmc", {{NULL}, {NULL}, BENCH_CONST(512), {NULL}}},
{"nor", {{NULL}, BENCH_CONST(1), BENCH_CONST(4096), {NULL}}},
{"nand", {{NULL}, BENCH_CONST(4096), BENCH_CONST(32768), {NULL}}},
{NULL, {{NULL}, {NULL}, {NULL}, {NULL}}},
{"default", {{0}, BENCH_CONST(16), BENCH_CONST(512), {0}}},
{"eeprom", {{0}, BENCH_CONST(1), BENCH_CONST(512), {0}}},
{"emmc", {{0}, {0}, BENCH_CONST(512), {0}}},
{"nor", {{0}, BENCH_CONST(1), BENCH_CONST(4096), {0}}},
{"nand", {{0}, BENCH_CONST(4096), BENCH_CONST(32768), {0}}},
{NULL, {{0}, {0}, {0}, {0}}},
};
const bench_geometry_t *bench_geometries = builtin_geometries;