From e67586b8b0dfbcf77ab52cc508dc8d9cfc319115 Mon Sep 17 00:00:00 2001 From: Christoffer Lerno Date: Sun, 11 Aug 2024 16:46:53 +0200 Subject: [PATCH] Fixes to library loading and test sources. --- src/build/build.h | 3 ++- src/build/libraries.c | 3 +-- src/compiler/compiler.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/build/build.h b/src/build/build.h index 223d297b4..5c6629825 100644 --- a/src/build/build.h +++ b/src/build/build.h @@ -5,6 +5,7 @@ #include "../version.h" #include "../utils/lib.h" +#include #define MAX_BUILD_LIB_DIRS 1024 #define MAX_COMMAND_LINE_FILES 2048 @@ -617,7 +618,7 @@ typedef struct } BuildTarget; static const char *x86_cpu_set[8] = { - [X86CPU_BASELINE] = "baseline", + [X86CPU_BASELINE] = "baseline", // NOLINT [X86CPU_SSSE3] = "ssse3", [X86CPU_SSE4] = "sse4", [X86CPU_AVX1] = "avx1", diff --git a/src/build/libraries.c b/src/build/libraries.c index fba7dc98d..b0919895c 100644 --- a/src/build/libraries.c +++ b/src/build/libraries.c @@ -71,8 +71,7 @@ static inline void parse_library_type(Library *library, LibraryTarget ***target_ static inline void parse_library_target(Library *library, LibraryTarget *target, const char *target_name, JSONObject *object) { - target->link_flags = target->link_flags = get_string_array(library->dir, target_name, object, "link-args", false); - + target->link_flags = get_string_array(library->dir, target_name, object, "link-args", false); if (!target->link_flags) { target->link_flags = get_string_array(library->dir, target_name, object, "linkflags", false); diff --git a/src/compiler/compiler.c b/src/compiler/compiler.c index b7b5ed16f..2911f8cba 100644 --- a/src/compiler/compiler.c +++ b/src/compiler/compiler.c @@ -1072,7 +1072,7 @@ void compile() { symtab_init(compiler.build.symtab_size); compiler.build.sources = target_expand_source_names(NULL, compiler.build.source_dirs, c3_suffix_list, 3, true); - if (compiler.build.testing) + if (compiler.build.testing && compiler.build.test_source_dirs) { const char **test_sources = target_expand_source_names(NULL, compiler.build.test_source_dirs, c3_suffix_list, 3, true); FOREACH(const char *, file, test_sources) vec_add(compiler.build.sources, file);